diff options
| author | truelight <truelight@openttd.org> | 2007-03-06 20:59:52 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-03-06 20:59:52 +0000 |
| commit | 43133c766c850ac4be15c9d357183d21aa765cc0 (patch) | |
| tree | 589dd69d82d0ad95f4e1c72216940e55d6208cf8 /src/openttd.cpp | |
| parent | 5bb9aed844e4c37f9c7bcb01772c409289c2ef86 (diff) | |
| download | openttd-43133c766c850ac4be15c9d357183d21aa765cc0.tar.xz | |
(svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have
a symbol called _pause (and therefor our variable conflicts with
thatone. We shouldn't be using _ as global indicator.....)
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 170f40e87..3ba03dad2 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -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(); |