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

Fix #10059: [Script] Clamp config item values to int32 

Also prevent random_deviation to be below 0.
pull/10628/head
SamuXarick 2023-02-03 20:06:29 +00:00 committed by rubidium42
parent addf30ecdf
commit 4b7099fa68
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/script/script_info.cpp
View File

@ -146,42 +146,42 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm)
} else if (strcmp(key, "min_value") == 0) { } else if (strcmp(key, "min_value") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.min_value = res; config.min_value = ClampToI32(res);
items |= 0x004; items |= 0x004;
} else if (strcmp(key, "max_value") == 0) { } else if (strcmp(key, "max_value") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.max_value = res; config.max_value = ClampToI32(res);
items |= 0x008; items |= 0x008;
} else if (strcmp(key, "easy_value") == 0) { } else if (strcmp(key, "easy_value") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.easy_value = res; config.easy_value = ClampToI32(res);
items |= 0x010; items |= 0x010;
} else if (strcmp(key, "medium_value") == 0) { } else if (strcmp(key, "medium_value") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.medium_value = res; config.medium_value = ClampToI32(res);
items |= 0x020; items |= 0x020;
} else if (strcmp(key, "hard_value") == 0) { } else if (strcmp(key, "hard_value") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.hard_value = res; config.hard_value = ClampToI32(res);
items |= 0x040; items |= 0x040;
} else if (strcmp(key, "random_deviation") == 0) { } else if (strcmp(key, "random_deviation") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.random_deviation = res; config.random_deviation = ClampToI32(abs(res));
items |= 0x200; items |= 0x200;
} else if (strcmp(key, "custom_value") == 0) { } else if (strcmp(key, "custom_value") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.custom_value = res; config.custom_value = ClampToI32(res);
items |= 0x080; items |= 0x080;
} else if (strcmp(key, "step_size") == 0) { } else if (strcmp(key, "step_size") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;
config.step_size = res; config.step_size = ClampToI32(res);
} else if (strcmp(key, "flags") == 0) { } else if (strcmp(key, "flags") == 0) {
SQInteger res; SQInteger res;
if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR;