From 9bbe6876ba22fa21a2ca664dc92faa4f78efd6c6 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 2 Mar 2006 09:57:28 +0000 Subject: (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. --- settings_gui.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'settings_gui.c') diff --git a/settings_gui.c b/settings_gui.c index a452c26b4..49d22600e 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -711,13 +711,11 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e) 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; -- cgit v1.2.3-70-g09d2