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

(svn r24208) -Codechange: Cleanup in the drawing routine.

Browse Source
This commit is contained in:
alberth 2012-05-06 14:59:26 +00:00
parent 9b5655f7ea
commit b5981bca90
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/settings_gui.cpp
View File

@ -1261,7 +1261,6 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd
const SettingDescBase *sdb = &sd->desc; const SettingDescBase *sdb = &sd->desc;
const void *var = ResolveVariableAddress(settings_ptr, sd); const void *var = ResolveVariableAddress(settings_ptr, sd);
bool editable = true; bool editable = true;
bool disabled = false;
bool rtl = _current_text_dir == TD_RTL; bool rtl = _current_text_dir == TD_RTL;
uint buttons_left = rtl ? right - 19 : left; uint buttons_left = rtl ? right - 19 : left;
@ -1282,19 +1281,16 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd
DrawBoolButton(buttons_left, button_y, on, editable); DrawBoolButton(buttons_left, button_y, on, editable);
SetDParam(1, on ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF); SetDParam(1, on ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
} else { } else {
int32 value; int32 value = (int32)ReadValue(var, sd->save.conv);
value = (int32)ReadValue(var, sd->save.conv);
/* Draw [<][>] boxes for settings of an integer-type */ /* Draw [<][>] boxes for settings of an integer-type */
DrawArrowButtons(buttons_left, button_y, COLOUR_YELLOW, state, editable && value != (sdb->flags & SGF_0ISDISABLED ? 0 : sdb->min), editable && (uint32)value != sdb->max); DrawArrowButtons(buttons_left, button_y, COLOUR_YELLOW, state,
editable && value != (sdb->flags & SGF_0ISDISABLED ? 0 : sdb->min), editable && (uint32)value != sdb->max);
disabled = (value == 0) && (sdb->flags & SGF_0ISDISABLED);
if ((sdb->flags & SGF_MULTISTRING) != 0) { if ((sdb->flags & SGF_MULTISTRING) != 0) {
SetDParam(1, sdb->val_str - sdb->min + value); SetDParam(1, sdb->val_str - sdb->min + value);
} else { } else {
SetDParam(1, sdb->val_str + disabled); SetDParam(1, sdb->val_str + ((value == 0 && (sdb->flags & SGF_0ISDISABLED) != 0) ? 1 : 0));
} }
SetDParam(2, value); SetDParam(2, value);
} }