gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add: support for std::string parameters in the script API

Browse Source
This commit is contained in:
Rubidium 2023-05-05 19:31:06 +02:00 committed by rubidium42
parent 98972a0748
commit 77177f7e8b
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/scripts/SquirrelExport.cmake
View File

@ -631,6 +631,8 @@ foreach(LINE IN LISTS SOURCE_LINES)
string(APPEND TYPES "a") string(APPEND TYPES "a")
elseif("${PARAM}" MATCHES "^Text") elseif("${PARAM}" MATCHES "^Text")
string(APPEND TYPES ".") string(APPEND TYPES ".")
elseif("${PARAM}" MATCHES "^std::string")
string(APPEND TYPES ".")
else() else()
string(APPEND TYPES "x") string(APPEND TYPES "x")
endif() endif()

14
src/script/squirrel_helper.hpp
View File

@ -91,6 +91,20 @@ namespace SQConvert {
} }
}; };
template <> struct Param<const std::string &> {
static inline const std::string Get(HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr)
{
/* Convert what-ever there is as parameter to a string */
sq_tostring(vm, index);
const SQChar *tmp;
sq_getstring(vm, -1, &tmp);
std::string result = StrMakeValid(tmp);
sq_poptop(vm);
return result;
}
};
template <typename Titem> template <typename Titem>
struct Param<Array<Titem>> { struct Param<Array<Titem>> {
static inline Array<Titem> Get(HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) static inline Array<Titem> Get(HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr)