dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r6365) -Cleanup: remove IsGeneratingWorld calls that are either not called or have no effect.

Browse Source
This commit is contained in:
rubidium
2006-09-03 22:07:28 +00:00
parent 29d93bb912
commit 819acd270a
5 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
video/cocoa_v.m
View File

@@ -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;
}

3
video/sdl_v.c
View File

@@ -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;
}

3
video/win32_v.c
View File

@@ -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;