From 80cb0b7fd67758743208bff73d0a13cec39e62dc Mon Sep 17 00:00:00 2001 From: darkvater Date: Fri, 10 Sep 2004 22:43:40 +0000 Subject: [PATCH] (svn r197) -Fix: Disable Fast Forward in network games visually (didn't work anyways, just showed graphical output) --- main_gui.c | 3 +++ sdl.c | 2 +- win32.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/main_gui.c b/main_gui.c index a7a8adef45..a281b31539 100644 --- a/main_gui.c +++ b/main_gui.c @@ -1654,6 +1654,9 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e) GfxFillRect(0, 0, w->width-1, w->height-1, 0xB2); GfxFillRect(0, 0, w->width-1, w->height-1, 0x80B4); + // if networking, disable fast-forward button + if (_networking) w->disabled_state |= (1 << 1); + // if spectator, disable things if (_current_player == OWNER_SPECTATOR){ w->disabled_state |= (1 << 0) | (1 << 19) | (1<<20) | (1<<21) | (1<<22) | (1<<23); diff --git a/sdl.c b/sdl.c index 56c16add29..ad8bc63637 100644 --- a/sdl.c +++ b/sdl.c @@ -542,7 +542,7 @@ static int SdlVideoMainLoop() #else if (keys[SDLK_TAB]) { #endif - _fast_forward |= 2; + if (!_networking) _fast_forward |= 2; } else if (_fast_forward&2) { _fast_forward = 0; } diff --git a/win32.c b/win32.c index 545dcdb74c..dc1a6a5095 100644 --- a/win32.c +++ b/win32.c @@ -672,7 +672,7 @@ static int Win32GdiMainLoop() #else if (_wnd.has_focus && GetAsyncKeyState(VK_TAB) < 0) { #endif - _fast_forward |= 2; + if (!_networking) _fast_forward |= 2; } else if (_fast_forward&2) { _fast_forward = 0; }