Mercurial > hg > openttd

changeset 3124:0be45148a4e6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r3732) - Fix two warnings. Stupid MSVC didn't even complain :s (Thank Tron and peter1138) - NOTE! There are a few warnings left in settings_gui because tha callback functions are disabled. I still need a good place for them.
author Darkvater <Darkvater@openttd.org>
date Thu, 02 Mar 2006 09:57:28 +0000
parents 9348dd869f8c
children c1c4a7aa2b80
files settings.c settings_gui.c
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/settings.c
+++ b/settings.c
@@ -961,7 +961,7 @@
 extern bool _force_full_redraw, _double_size;
 extern uint _display_hz, _fullscreen_bpp;
 
-extern const SettingDescGlobVarList _win32_settings[] = {
+static const SettingDescGlobVarList _win32_settings[] = {
 	 SDTG_VAR("display_hz",     SLE_UINT, S, 0, _display_hz,       0, 0, 120, STR_NULL, NULL),
 	SDTG_BOOL("force_full_redraw",        S, 0, _force_full_redraw,false,     STR_NULL, NULL),
 	 SDTG_VAR("fullscreen_bpp", SLE_UINT, S, 0, _fullscreen_bpp,   8, 8,  32, STR_NULL, NULL),
--- a/settings_gui.c
+++ b/settings_gui.c
@@ -711,13 +711,11 @@
 			if ((sdb->flags & SGF_NETWORK_ONLY) && !_networking) editable = false;
 
 			if (sdb->cmd == SDT_BOOLX) {
-				static const _bool_ctabs[4] = {9, 7, 4, 6};
+				static const int _bool_ctabs[2][2] = {{9, 4}, {7, 6}};
 				/* Draw checkbox for boolean-value either on/off */
 				bool on = (*(bool*)var);
-				byte ctab = !!on + (!!editable * 2);
-				assert(ctab < lengthof(_bool_ctabs));
 
-				DrawFrameRect(x, y, x + 19, y + 8, _bool_ctabs[ctab], on ? FR_LOWERED : 0);
+				DrawFrameRect(x, y, x + 19, y + 8, _bool_ctabs[!!on][!!editable], on ? FR_LOWERED : 0);
 				SetDParam(0, on ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF);
 			} else {
 				int32 value;