From c4e4fa98fde0570e9f45050e286fca17de7113b6 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 7 Nov 2006 14:41:53 +0000 Subject: (svn r7098) -Regression (r7094): Zoom buttons were not properly updated with a new/loaded game. The good thing is, we got rid of even more magic code (tm) --- main_gui.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'main_gui.c') diff --git a/main_gui.c b/main_gui.c index 879618953..bf34a9330 100644 --- a/main_gui.c +++ b/main_gui.c @@ -879,7 +879,6 @@ bool DoZoomInOutWindow(int how, Window *w) vp->virtual_width <<= 1; vp->virtual_height <<= 1; break; - default: return false; } SetWindowDirty(w); @@ -2413,13 +2412,9 @@ void ShowVitalWindows(void) { Window *w; - if (_game_mode != GM_EDITOR) { - w = AllocateWindowDesc(&_toolb_normal_desc); - DisableWindowWidget(w, 18); - } else { - w = AllocateWindowDesc(&_toolb_scen_desc); - DisableWindowWidget(w, 10); - } + w = AllocateWindowDesc((_game_mode != GM_EDITOR) ? &_toolb_normal_desc : &_toolb_scen_desc); + DoZoomInOutWindow(ZOOM_NONE, w); + CLRBITS(w->flags4, WF_WHITE_BORDER_MASK); SetWindowWidgetDisabledState(w, 0, _networking && !_network_server); // if not server, disable pause button -- cgit v1.2.3-54-g00ecf