diff options
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index f3014911fc..bc46d8e1f5 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -52,6 +52,8 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags) _gameSpeed = 60; _tickLength = (uint8)(1000.0 / _gameSpeed); + _quitFlag = false; + _speechFile = ""; _trackMap = 0; _trackMapSize = 0; @@ -200,10 +202,7 @@ KyraEngine_v1::~KyraEngine_v1() { void KyraEngine_v1::quitGame() { debugC(9, kDebugLevelMain, "KyraEngine_v1::quitGame()"); - Common::Event event; - - event.type = Common::EVENT_QUIT; - _eventMan->pushEvent(event); + _quitFlag = true; // Nothing to do here } @@ -241,7 +240,7 @@ int KyraEngine_v1::resetGameFlag(int flag) { } void KyraEngine_v1::delayUntil(uint32 timestamp, bool updateTimers, bool update, bool isMainLoop) { - while (_system->getMillis() < timestamp && !quit()) { + while (_system->getMillis() < timestamp && !_quitFlag) { if (timestamp - _system->getMillis() >= 10) delay(10, update, isMainLoop); } |