mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-16 00:42:45 +01:00
Code Issues Releases Wiki Activity

Codechange: use std::string_view for sq_getstring

Browse Source
This commit is contained in:
Rubidium
2025-05-02 18:46:50 +02:00
committed by rubidium42
parent f4f05dea33
commit 278aee2c19
12 changed files with 74 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/squirrel.cpp
View File

@@ -194,7 +194,7 @@ void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *so
}
}
void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, const std::string &s)
void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, std::string_view s)
{
/* Check if we have a custom print function */
SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func;
@@ -205,7 +205,7 @@ void Squirrel::ErrorPrintFunc(HSQUIRRELVM vm, const std::string &s)
}
}
void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error)
void Squirrel::RunError(HSQUIRRELVM vm, std::string_view error)
{
/* Set the print function to something that prints to stderr */
SQPRINTFUNCTION pf = sq_getprintfunc(vm);
@@ -229,11 +229,11 @@ void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error)
SQInteger Squirrel::_RunError(HSQUIRRELVM vm)
{
const SQChar *sErr = nullptr;
std::string_view view;
if (sq_gettop(vm) >= 1) {
if (SQ_SUCCEEDED(sq_getstring(vm, -1, &sErr))) {
Squirrel::RunError(vm, sErr);
if (SQ_SUCCEEDED(sq_getstring(vm, -1, view))) {
Squirrel::RunError(vm, view);
return 0;
}
}
@@ -242,7 +242,7 @@ SQInteger Squirrel::_RunError(HSQUIRRELVM vm)
return 0;
}
void Squirrel::PrintFunc(HSQUIRRELVM vm, const std::string &s)
void Squirrel::PrintFunc(HSQUIRRELVM vm, std::string_view s)
{
/* Check if we have a custom print function */
SQPrintFunc *func = ((Squirrel *)sq_getforeignptr(vm))->print_func;