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/lure/fights.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/lure/fights.cpp')
| -rw-r--r-- | engines/lure/fights.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp index dcf09ba50d..5323122fa6 100644 --- a/engines/lure/fights.cpp +++ b/engines/lure/fights.cpp @@ -22,6 +22,7 @@ #include "lure/fights.h" #include "lure/luredefs.h" #include "lure/game.h" +#include "lure/lure.h" #include "lure/res.h" #include "lure/room.h" #include "lure/sound.h" @@ -108,6 +109,7 @@ bool FightsManager::isFighting() { } void FightsManager::fightLoop() { + LureEngine &engine = LureEngine::getReference(); Resources &res = Resources::getReference(); Game &game = Game::getReference(); Room &room = Room::getReference(); @@ -116,7 +118,7 @@ void FightsManager::fightLoop() { uint32 timerVal = g_system->getMillis(); // Loop for the duration of the battle - while (!events.quitFlag && (playerFight.fwhits != GENERAL_MAGIC_ID)) { + while (!engine._quit && (playerFight.fwhits != GENERAL_MAGIC_ID)) { checkEvents(); if (g_system->getMillis() > timerVal + GAME_FRAME_DELAY) { @@ -184,6 +186,7 @@ const KeyMapping keyList[] = { {Common::KEYCODE_INVALID, 0}}; void FightsManager::checkEvents() { + LureEngine &engine = LureEngine::getReference(); Game &game = Game::getReference(); Events &events = Events::getReference(); Mouse &mouse = Mouse::getReference(); @@ -196,7 +199,7 @@ void FightsManager::checkEvents() { if (events.type() == Common::EVENT_KEYDOWN) { switch (events.event().kbd.keycode) { case Common::KEYCODE_ESCAPE: - events.quitFlag = true; + engine._quit = true; return; case Common::KEYCODE_d: |