diff options
| author | rubidium <rubidium@openttd.org> | 2006-09-03 22:07:28 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2006-09-03 22:07:28 +0000 |
| commit | 03f963af586f384de2346e9292f69021caec5a7b (patch) | |
| tree | 53fdde2d9d1885beeab16ea42516beb84b8ba143 /video | |
| parent | e98adc5d0a424a46c47b05a223417da41db83250 (diff) | |
| download | openttd-03f963af586f384de2346e9292f69021caec5a7b.tar.xz | |
(svn r6365) -Cleanup: remove IsGeneratingWorld calls that are either not called or have no effect.
Diffstat (limited to 'video')
| -rw-r--r-- | video/cocoa_v.m | 3 | ||||
| -rw-r--r-- | video/sdl_v.c | 3 | ||||
| -rw-r--r-- | video/win32_v.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/video/cocoa_v.m b/video/cocoa_v.m index 534ea68ee..d2b88b5f2 100644 --- a/video/cocoa_v.m +++ b/video/cocoa_v.m @@ -56,7 +56,6 @@ extern void HideMenuBar(void); #include "../window.h" #include "../network.h" #include "../variables.h" -#include "../genworld.h" #include "../os/macosx/splash.h" #include "cocoa_v.h" @@ -711,7 +710,7 @@ static void QZ_GameLoop(void) #endif { if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2; - } else if (_fast_forward & 2 && !IsGeneratingWorld()) { + } else if (_fast_forward & 2) { _fast_forward = 0; } diff --git a/video/sdl_v.c b/video/sdl_v.c index bd1eb5b8f..57c81c556 100644 --- a/video/sdl_v.c +++ b/video/sdl_v.c @@ -13,7 +13,6 @@ #include "../window.h" #include "../network.h" #include "../variables.h" -#include "../genworld.h" #include "sdl_v.h" #include <SDL.h> @@ -461,7 +460,7 @@ static void SdlVideoMainLoop(void) if (keys[SDLK_TAB]) #endif { - if (!_networking && _game_mode != GM_MENU && !IsGeneratingWorld()) _fast_forward |= 2; + if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2; } else if (_fast_forward & 2) { _fast_forward = 0; } diff --git a/video/win32_v.c b/video/win32_v.c index db4fcb584..207683db4 100644 --- a/video/win32_v.c +++ b/video/win32_v.c @@ -9,7 +9,6 @@ #include "../variables.h" #include "../win32.h" #include "../window.h" -#include "../genworld.h" #include "win32_v.h" #include <windows.h> @@ -801,7 +800,7 @@ static void Win32GdiMainLoop(void) * real key is in the upper 16 bits (see WM_SYSKEYDOWN in WndProcGdi()) */ if ((_pressed_key >> 16) & WKC_TAB && #endif - !_networking && _game_mode != GM_MENU && !IsGeneratingWorld()) + !_networking && _game_mode != GM_MENU) _fast_forward |= 2; } else if (_fast_forward & 2) { _fast_forward = 0; |