diff options
| author | alberth <alberth@openttd.org> | 2012-05-06 14:59:26 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2012-05-06 14:59:26 +0000 |
| commit | b5981bca90b8296d3ab6f977c05e198e256fb166 (patch) | |
| tree | 97b6fe4569d6af70c112a716196914d711216076 /src | |
| parent | 9b5655f7eaef9a315928328e76d032f48c417d1a (diff) | |
| download | openttd-b5981bca90b8296d3ab6f977c05e198e256fb166.tar.xz | |
(svn r24208) -Codechange: Cleanup in the drawing routine.
Diffstat (limited to 'src')
| -rw-r--r-- | src/settings_gui.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 5103bd572..a0529b05d 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1261,7 +1261,6 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd const SettingDescBase *sdb = &sd->desc; const void *var = ResolveVariableAddress(settings_ptr, sd); bool editable = true; - bool disabled = false; bool rtl = _current_text_dir == TD_RTL; 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); SetDParam(1, on ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF); } else { - int32 value; - - value = (int32)ReadValue(var, sd->save.conv); + int32 value = (int32)ReadValue(var, sd->save.conv); /* 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); - - disabled = (value == 0) && (sdb->flags & SGF_0ISDISABLED); + DrawArrowButtons(buttons_left, button_y, COLOUR_YELLOW, state, + editable && value != (sdb->flags & SGF_0ISDISABLED ? 0 : sdb->min), editable && (uint32)value != sdb->max); if ((sdb->flags & SGF_MULTISTRING) != 0) { SetDParam(1, sdb->val_str - sdb->min + value); } else { - SetDParam(1, sdb->val_str + disabled); + SetDParam(1, sdb->val_str + ((value == 0 && (sdb->flags & SGF_0ISDISABLED) != 0) ? 1 : 0)); } SetDParam(2, value); } |