gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-18 19:19:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Deduplicate DefSQClass::DefSQ[Static]Method()

Browse Source
This commit is contained in:
glx22 2025-06-12 01:38:37 +02:00 committed by Loïc Guilloux
parent 90e21bc713
commit 8e3acbfa84
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/script/squirrel_class.hpp
View File

@ -27,13 +27,16 @@ public:
{} {}
/** /**
* This defines a method inside a class for Squirrel. * This defines a method inside a class for Squirrel with defined params.
* @note If you define params, make sure that the first param is always 'x',
* which is the 'this' inside the function. This is hidden from the rest
* of the code, but without it calling your function will fail!
*/ */
template <typename Func> template <typename Func>
void DefSQMethod(Squirrel &engine, Func function_proc, std::string_view function_name) void DefSQMethod(Squirrel &engine, Func function_proc, std::string_view function_name, std::string_view params = {})
{ {
using namespace SQConvert; using namespace SQConvert;
engine.AddMethod(function_name, DefSQNonStaticCallback<CL, Func, ST>, {}, &function_proc, sizeof(function_proc)); engine.AddMethod(function_name, DefSQNonStaticCallback<CL, Func, ST>, params, &function_proc, sizeof(function_proc));
} }
/** /**
@ -47,26 +50,16 @@ public:
} }
/** /**
* This defines a method inside a class for Squirrel with defined params. * This defines a static method inside a class for Squirrel with defined params.
* @note If you define nparam, make sure that the first param is always 'x', * @note If you define params, make sure that the first param is always 'x',
* which is the 'this' inside the function. This is hidden from the rest * which is the 'this' inside the function. This is hidden from the rest
* of the code, but without it calling your function will fail! * of the code, but without it calling your function will fail!
*/ */
template <typename Func> template <typename Func>
void DefSQMethod(Squirrel &engine, Func function_proc, std::string_view function_name, std::string_view params) void DefSQStaticMethod(Squirrel &engine, Func function_proc, std::string_view function_name, std::string_view params = {})
{ {
using namespace SQConvert; using namespace SQConvert;
engine.AddMethod(function_name, DefSQNonStaticCallback<CL, Func, ST>, params, &function_proc, sizeof(function_proc)); engine.AddMethod(function_name, DefSQStaticCallback<CL, Func>, params, &function_proc, sizeof(function_proc));
}
/**
* This defines a static method inside a class for Squirrel.
*/
template <typename Func>
void DefSQStaticMethod(Squirrel &engine, Func function_proc, std::string_view function_name)
{
using namespace SQConvert;
engine.AddMethod(function_name, DefSQStaticCallback<CL, Func>, {}, &function_proc, sizeof(function_proc));
} }
/** /**
@ -79,19 +72,6 @@ public:
engine.AddMethod(function_name, DefSQAdvancedStaticCallback<CL, Func>, {}, &function_proc, sizeof(function_proc)); engine.AddMethod(function_name, DefSQAdvancedStaticCallback<CL, Func>, {}, &function_proc, sizeof(function_proc));
} }
/**
* This defines a static method inside a class for Squirrel with defined params.
* @note If you define nparam, make sure that the first param is always 'x',
* which is the 'this' inside the function. This is hidden from the rest
* of the code, but without it calling your function will fail!
*/
template <typename Func>
void DefSQStaticMethod(Squirrel &engine, Func function_proc, std::string_view function_name, std::string_view params)
{
using namespace SQConvert;
engine.AddMethod(function_name, DefSQStaticCallback<CL, Func>, params, &function_proc, sizeof(function_proc));
}
template <typename Var> template <typename Var>
void DefSQConst(Squirrel &engine, Var value, std::string_view var_name) void DefSQConst(Squirrel &engine, Var value, std::string_view var_name)
{ {