diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-13 17:39:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-13 17:39:00 +0000 |
| commit | 5f81ba886c0d1341441d68b3346a374c77aac972 (patch) | |
| tree | 8a948f402fa6e255d5db8ab2c42b0552ef62dd38 /src/settings_gui.cpp | |
| parent | d23f616e9f2a381c6431d8374d52fe13f5ad5052 (diff) | |
| download | openttd-5f81ba886c0d1341441d68b3346a374c77aac972.tar.xz | |
(svn r16297) -Codechange: silence more ICC warnings
Diffstat (limited to 'src/settings_gui.cpp')
| -rw-r--r-- | src/settings_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 0a7da6f1d..70dfb70bb 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -563,7 +563,7 @@ public: DrawArrowButtons(5, y, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + !!this->clicked_increase : 0, editable && sdb->min != value, - editable && sdb->max != value); + editable && sdb->max != (uint32)value); value += sdb->str; SetDParam(0, value); @@ -992,7 +992,7 @@ void SettingEntry::DrawSetting(GameSettings *settings_ptr, const SettingDesc *sd value = (int32)ReadValue(var, sd->save.conv); /* Draw [<][>] boxes for settings of an integer-type */ - DrawArrowButtons(x, y, COLOUR_YELLOW, state, editable && value != (sdb->flags & SGF_0ISDISABLED ? 0 : sdb->min), editable && value != sdb->max); + DrawArrowButtons(x, 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 (disabled) { @@ -1440,7 +1440,7 @@ struct GameSettingsWindow : Window { /* Increase or decrease the value and clamp it to extremes */ if (x >= 10) { value += step; - if (value > sdb->max) value = sdb->max; + if ((uint32)value > sdb->max) value = (int32)sdb->max; if (value < sdb->min) value = sdb->min; // skip between "disabled" and minimum } else { value -= step; |