[Scummvm-cvs-logs] scummvm master -> 58bfb3b43588152490efc55c24ca8c94e8f39e38
Strangerke
Strangerke at scummvm.org
Mon Jun 9 18:03:59 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
58bfb3b435 CRUISE: Remove a couple of useless variables
Commit: 58bfb3b43588152490efc55c24ca8c94e8f39e38
https://github.com/scummvm/scummvm/commit/58bfb3b43588152490efc55c24ca8c94e8f39e38
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-09T17:57:14+02:00
Commit Message:
CRUISE: Remove a couple of useless variables
Changed paths:
engines/cruise/cruise_main.cpp
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 6b09e1d..f2f7e0c 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);
More information about the Scummvm-git-logs
mailing list