diff options
author | Christopher Page | 2008-06-25 00:55:18 +0000 |
---|---|---|
committer | Christopher Page | 2008-06-25 00:55:18 +0000 |
commit | 6e3474896cec0e42c2f5ac7ccb5783981d746fcc (patch) | |
tree | 60d70df6441d3d1084853fbe18e7bccc8bad29db /engines/kyra/kyra_v1.cpp | |
parent | c14804e22f5171e6aa7b2cf5d383a4e28180aa7a (diff) | |
download | scummvm-rg350-6e3474896cec0e42c2f5ac7ccb5783981d746fcc.tar.gz scummvm-rg350-6e3474896cec0e42c2f5ac7ccb5783981d746fcc.tar.bz2 scummvm-rg350-6e3474896cec0e42c2f5ac7ccb5783981d746fcc.zip |
Kyra and Lure are now using the new _quit flag
svn-id: r32772
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
-rw-r--r-- | engines/kyra/kyra_v1.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 1cc1d728bf..c87f8bc46a 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -52,8 +52,6 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags) _gameSpeed = 60; _tickLength = (uint8)(1000.0 / _gameSpeed); - _quitFlag = false; - _speechFile = ""; _trackMap = 0; _trackMapSize = 0; @@ -220,7 +218,7 @@ KyraEngine_v1::~KyraEngine_v1() { void KyraEngine_v1::quitGame() { debugC(9, kDebugLevelMain, "KyraEngine_v1::quitGame()"); - _quitFlag = true; + _quit = true; // Nothing to do here } @@ -258,7 +256,7 @@ int KyraEngine_v1::resetGameFlag(int flag) { } void KyraEngine_v1::delayUntil(uint32 timestamp, bool updateTimers, bool update, bool isMainLoop) { - while (_system->getMillis() < timestamp && !_quitFlag) { + while (_system->getMillis() < timestamp && !_quit) { if (timestamp - _system->getMillis() >= 10) delay(10, update, isMainLoop); } |