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

Change: Use default value for invalid multi-string settings instead of clamping to min or max value. (#7361)

pull/7382/head
PeterN 2019-03-16 16:52:07 +00:00 committed by Charles Pigott
parent 7bd43f7413
commit bcfc9620b0
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/settings.cpp
View File

@ -448,13 +448,30 @@ static void Write_ValidateSetting(void *ptr, const SettingDesc *sd, int32 val)
case SLE_VAR_U16: case SLE_VAR_U16:
case SLE_VAR_I32: { case SLE_VAR_I32: {
/* Override the minimum value. No value below sdb->min, except special value 0 */ /* Override the minimum value. No value below sdb->min, except special value 0 */
if (!(sdb->flags & SGF_0ISDISABLED) || val != 0) val = Clamp(val, sdb->min, sdb->max); if (!(sdb->flags & SGF_0ISDISABLED) || val != 0) {
if (!(sdb->flags & SGF_MULTISTRING)) {
/* Clamp value-type setting to its valid range */
val = Clamp(val, sdb->min, sdb->max);
} else if (val < sdb->min || val > (int32)sdb->max) {
/* Reset invalid discrete setting (where different values change gameplay) to its default value */
val = (int32)(size_t)sdb->def;
}
}
break; break;
} }
case SLE_VAR_U32: { case SLE_VAR_U32: {
/* Override the minimum value. No value below sdb->min, except special value 0 */ /* Override the minimum value. No value below sdb->min, except special value 0 */
uint min = ((sdb->flags & SGF_0ISDISABLED) && (uint)val <= (uint)sdb->min) ? 0 : sdb->min; uint32 uval = (uint32)val;
WriteValue(ptr, SLE_VAR_U32, (int64)ClampU(val, min, sdb->max)); if (!(sdb->flags & SGF_0ISDISABLED) || uval != 0) {
if (!(sdb->flags & SGF_MULTISTRING)) {
/* Clamp value-type setting to its valid range */
uval = ClampU(uval, sdb->min, sdb->max);
} else if (uval < (uint)sdb->min || uval > sdb->max) {
/* Reset invalid discrete setting to its default value */
uval = (uint32)(size_t)sdb->def;
}
}
WriteValue(ptr, SLE_VAR_U32, (int64)uval);
return; return;
} }
case SLE_VAR_I64: case SLE_VAR_I64: