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

(svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have

Browse Source 
a symbol called _pause (and therefor our variable conflicts with 
 thatone. We shouldn't be using _ as global indicator.....)
This commit is contained in:
truelight
2007-03-06 20:59:52 +00:00
parent 62c107558f
commit b3b14ac2ad
11 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openttd.cpp
View File

@@ -319,7 +319,7 @@ static void LoadIntroGame(void)
WaitTillGeneratedWorld();
}
_pause = 0;
_pause_game = 0;
SetLocalPlayer(PLAYER_FIRST);
/* Make sure you can't scroll in the menu */
_scrolling_viewport = 0;
@@ -903,7 +903,7 @@ void SwitchMode(int new_mode)
void StateGameLoop(void)
{
// dont execute the state loop during pause
if (_pause) return;
if (_pause_game) return;
if (IsGeneratingWorld()) return;
if (_game_mode == GM_EDITOR) {
@@ -1064,9 +1064,9 @@ void GameLoop(void)
StateGameLoop();
#endif /* ENABLE_NETWORK */
if (!_pause && _display_opt & DO_FULL_ANIMATION) DoPaletteAnimations();
if (!_pause_game && _display_opt & DO_FULL_ANIMATION) DoPaletteAnimations();
if (!_pause || _cheats.build_in_pause.value) MoveAllTextEffects();
if (!_pause_game || _cheats.build_in_pause.value) MoveAllTextEffects();
InputLoop();