aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_hof.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-06-25 00:55:18 +0000
committerChristopher Page2008-06-25 00:55:18 +0000
commit6e3474896cec0e42c2f5ac7ccb5783981d746fcc (patch)
tree60d70df6441d3d1084853fbe18e7bccc8bad29db /engines/kyra/kyra_hof.cpp
parentc14804e22f5171e6aa7b2cf5d383a4e28180aa7a (diff)
downloadscummvm-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_hof.cpp')
-rw-r--r--engines/kyra/kyra_hof.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index 57f0dcc24a..040ee0526f 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -311,7 +311,7 @@ int KyraEngine_HoF::go() {
seq_playSequences(kSequenceFunters, kSequenceFrash);
}
- return 0;
+ return _rtl;
}
void KyraEngine_HoF::startup() {
@@ -440,9 +440,9 @@ void KyraEngine_HoF::startup() {
void KyraEngine_HoF::runLoop() {
_screen->updateScreen();
- _quitFlag = false;
+ _quit = false;
_runFlag = true;
- while (!_quitFlag && _runFlag) {
+ while (!_quit && _runFlag) {
if (_deathHandler >= 0) {
removeHandItem();
delay(5);
@@ -1603,7 +1603,7 @@ void KyraEngine_HoF::loadInvWsa(const char *filename, int run, int delayTime, in
_invWsa.timer = _system->getMillis();
if (run) {
- while (_invWsa.running && !skipFlag() && !_quitFlag) {
+ while (_invWsa.running && !skipFlag() && !_quit) {
update();
_system->delayMillis(10);
}
@@ -1977,7 +1977,7 @@ void KyraEngine_HoF::playTim(const char *filename) {
return;
_tim->resetFinishedFlag();
- while (!_quitFlag && !_tim->finished()) {
+ while (!_quit && !_tim->finished()) {
_tim->exec(tim, 0);
if (_chatText)
updateWithText();