diff options
| author | Christopher Page | 2008-07-08 06:00:39 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-08 06:00:39 +0000 |
| commit | b8fe71e7a12e60f0c19fa86da83f270dc09e14fd (patch) | |
| tree | d94aa645b95cd237f53713c5ead37ab196af38de /engines/kyra/text_mr.cpp | |
| parent | 94beb3037e55803dd45e5720af8320f0ebccb9ac (diff) | |
| download | scummvm-rg350-b8fe71e7a12e60f0c19fa86da83f270dc09e14fd.tar.gz scummvm-rg350-b8fe71e7a12e60f0c19fa86da83f270dc09e14fd.tar.bz2 scummvm-rg350-b8fe71e7a12e60f0c19fa86da83f270dc09e14fd.zip | |
Updated KYRA to work with the new GMM implementation
svn-id: r32959
Diffstat (limited to 'engines/kyra/text_mr.cpp')
| -rw-r--r-- | engines/kyra/text_mr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index d9ef59e226..be306ceec1 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -349,7 +349,7 @@ void KyraEngine_MR::objectChatWaitToFinish() { const uint32 endTime = _chatEndTime; resetSkipFlag(); - while (running && !_eventMan->shouldQuit()) { + while (running && !quit()) { if (!_emc->isValid(&_chatScriptState)) _emc->start(&_chatScriptState, 1); @@ -367,7 +367,7 @@ void KyraEngine_MR::objectChatWaitToFinish() { uint32 nextFrame = _system->getMillis() + delayTime * _tickLength; - while (_system->getMillis() < nextFrame && !_eventMan->shouldQuit()) { + while (_system->getMillis() < nextFrame && !quit()) { updateWithText(); const uint32 curTime = _system->getMillis(); @@ -419,7 +419,7 @@ void KyraEngine_MR::badConscienceChatWaitToFinish() { uint32 nextFrame = _system->getMillis() + _rnd.getRandomNumberRng(4, 8) * _tickLength; int frame = _badConscienceFrameTable[_badConscienceAnim+24]; - while (running && !_eventMan->shouldQuit()) { + while (running && !quit()) { if (nextFrame < _system->getMillis()) { ++frame; if (_badConscienceFrameTable[_badConscienceAnim+32] < frame) @@ -477,7 +477,7 @@ void KyraEngine_MR::goodConscienceChatWaitToFinish() { uint32 nextFrame = _system->getMillis() + _rnd.getRandomNumberRng(3, 6) * _tickLength; int frame = _goodConscienceFrameTable[_goodConscienceAnim+15]; - while (running && !_eventMan->shouldQuit()) { + while (running && !quit()) { if (nextFrame < _system->getMillis()) { ++frame; if (_goodConscienceFrameTable[_goodConscienceAnim+20] < frame) @@ -597,7 +597,7 @@ void KyraEngine_MR::albumChatWaitToFinish() { uint32 nextFrame = 0; int frame = 12; - while (running && !_eventMan->shouldQuit()) { + while (running && !quit()) { if (nextFrame < _system->getMillis()) { ++frame; if (frame > 22) |