mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Add: [Script] Auto-convert ObjectType bool to integer when setting values for items in lists via []

pull/14308/head
SamuXarick 2025-05-29 18:07:19 +01:00
parent 10c159a79f
commit 57cea4e98c
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/script/api/script_list.cpp
View File

@ -844,18 +844,32 @@ SQInteger ScriptList::_get(HSQUIRRELVM vm)
SQInteger ScriptList::_set(HSQUIRRELVM vm) SQInteger ScriptList::_set(HSQUIRRELVM vm)
{ {
if (sq_gettype(vm, 2) != OT_INTEGER) return SQ_ERROR; if (sq_gettype(vm, 2) != OT_INTEGER) return SQ_ERROR;
if (sq_gettype(vm, 3) != OT_INTEGER && sq_gettype(vm, 3) != OT_NULL) {
return sq_throwerror(vm, "you can only assign integers to this list");
}
SQInteger idx, val; SQInteger idx;
sq_getinteger(vm, 2, &idx); sq_getinteger(vm, 2, &idx);
if (sq_gettype(vm, 3) == OT_NULL) {
this->RemoveItem(idx); /* Retrieve the return value */
return 0; SQInteger val;
switch (sq_gettype(vm, 3)) {
case OT_NULL:
this->RemoveItem(idx);
return 0;
case OT_BOOL: {
SQBool v;
sq_getbool(vm, 3, &v);
val = v ? 1 : 0;
break;
}
case OT_INTEGER:
sq_getinteger(vm, 3, &val);
break;
default:
return sq_throwerror(vm, "you can only assign integers to this list");
} }
sq_getinteger(vm, 3, &val);
if (!this->HasItem(idx)) { if (!this->HasItem(idx)) {
this->AddItem(idx, val); this->AddItem(idx, val);
return 0; return 0;