dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change: [Script] Automate the ScriptObject reference counting

Browse Source
This commit is contained in:
Rubidium
2023-02-28 17:13:38 +01:00
committed by Loïc Guilloux
parent a1fc4d5c0e
commit 728973859d
3 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/script/api/script_text.cpp
View File

@@ -53,19 +53,10 @@ ScriptText::ScriptText(HSQUIRRELVM vm) :
}
}
ScriptText::~ScriptText()
{
for (int i = 0; i < SCRIPT_TEXT_MAX_PARAMETERS; i++) {
if (std::holds_alternative<ScriptText *>(this->param[i])) std::get<ScriptText *>(this->param[i])->Release();
}
}
SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm)
{
if (parameter >= SCRIPT_TEXT_MAX_PARAMETERS) return SQ_ERROR;
if (std::holds_alternative<ScriptText *>(this->param[parameter])) std::get<ScriptText *>(this->param[parameter])->Release();
switch (sq_gettype(vm, -1)) {
case OT_STRING: {
const SQChar *value;
@@ -102,8 +93,7 @@ SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm)
if (real_instance == nullptr) return SQ_ERROR;
ScriptText *value = static_cast<ScriptText *>(real_instance);
value->AddRef();
this->param[parameter] = value;
this->param[parameter] = ScriptTextRef(value);
break;
}
@@ -184,9 +174,9 @@ char *ScriptText::_GetEncodedText(char *p, char *lastofp, int &param_count)
param_count++;
continue;
}
if (std::holds_alternative<ScriptText *>(this->param[i])) {
if (std::holds_alternative<ScriptTextRef>(this->param[i])) {
p += seprintf(p, lastofp, ":");
p = std::get<ScriptText *>(this->param[i])->_GetEncodedText(p, lastofp, param_count);
p = std::get<ScriptTextRef>(this->param[i])->_GetEncodedText(p, lastofp, param_count);
continue;
}
p += seprintf(p, lastofp, ":" OTTD_PRINTFHEX64, std::get<SQInteger>(this->param[i]));