diff options
| author | Strangerke | 2014-06-09 17:57:14 +0200 |
|---|---|---|
| committer | Strangerke | 2014-06-09 17:57:14 +0200 |
| commit | 58bfb3b43588152490efc55c24ca8c94e8f39e38 (patch) | |
| tree | 9c279793dbd5bd627f250711390f647d59bf93a9 /engines/cruise | |
| parent | ff93aef6ec86cb00778a36a28909b6c0e9ed0c08 (diff) | |
| download | scummvm-rg350-58bfb3b43588152490efc55c24ca8c94e8f39e38.tar.gz scummvm-rg350-58bfb3b43588152490efc55c24ca8c94e8f39e38.tar.bz2 scummvm-rg350-58bfb3b43588152490efc55c24ca8c94e8f39e38.zip | |
CRUISE: Remove a couple of useless variables
Diffstat (limited to 'engines/cruise')
| -rw-r--r-- | engines/cruise/cruise_main.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 6b09e1dc65..f2f7e0c2b0 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -35,10 +35,10 @@ namespace Cruise { enum RelationType {RT_REL = 30, RT_MSG = 50}; -static int playerDontAskQuit; +static bool _playerDontAskQuit; unsigned int timer = 0; -gfxEntryStruct* linkedMsgList = NULL; +gfxEntryStruct *linkedMsgList = nullptr; typedef CruiseEngine::MemInfo MemInfo; @@ -1706,7 +1706,7 @@ bool manageEvents() { break; case Common::EVENT_QUIT: case Common::EVENT_RTL: - playerDontAskQuit = 1; + _playerDontAskQuit = true; break; case Common::EVENT_KEYUP: switch (event.kbd.keycode) { @@ -1779,9 +1779,7 @@ void CruiseEngine::mainLoop() { initAllData(); - playerDontAskQuit = 0; - int quitValue2 = 1; - int quitValue = 0; + _playerDontAskQuit = false; if (ConfMan.hasKey("save_slot")) loadGameState(ConfMan.getInt("save_slot")); @@ -1839,12 +1837,12 @@ void CruiseEngine::mainLoop() { currentTick = g_system->getMillis(); } - if (playerDontAskQuit) + if (_playerDontAskQuit) break; _vm->getDebugger()->onFrame(); } while (currentTick < lastTick + _gameSpeed && !bFastMode); - if (playerDontAskQuit) + if (_playerDontAskQuit) break; lastTick = g_system->getMillis(); @@ -1871,8 +1869,8 @@ void CruiseEngine::mainLoop() { currentMouseButton = 0; } - playerDontAskQuit = processInput(); - if (playerDontAskQuit) + _playerDontAskQuit = processInput(); + if (_playerDontAskQuit) break; if (enableUser) { @@ -1976,7 +1974,7 @@ void CruiseEngine::mainLoop() { g_system->updateScreen(); } - } while (!playerDontAskQuit && quitValue2 && quitValue != 7); + } while (!_playerDontAskQuit); // Free data removeAllScripts(&relHead); |