aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/menu.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/lure/menu.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/lure/menu.cpp')
-rw-r--r--engines/lure/menu.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index 0b4ef06081..3468e49582 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.cpp
@@ -116,6 +116,7 @@ Menu &Menu::getReference() {
uint8 Menu::execute() {
OSystem &system = *g_system;
+ LureEngine &engine = LureEngine::getReference();
Mouse &mouse = Mouse::getReference();
Events &events = Events::getReference();
Screen &screen = Screen::getReference();
@@ -130,7 +131,7 @@ uint8 Menu::execute() {
while (mouse.lButton() || mouse.rButton()) {
while (events.pollEvent()) {
- if (events.quitFlag) return MENUITEM_NONE;
+ if (engine._quit) return MENUITEM_NONE;
if (mouse.y() < MENUBAR_Y_SIZE) {
MenuRecord *p = getMenuAt(mouse.x());
@@ -467,6 +468,7 @@ Action PopupMenu::Show(int numEntries, Action *actions) {
uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
if (numEntries == 0) return 0xffff;
+ LureEngine &engine = LureEngine::getReference();
Events &e = Events::getReference();
Mouse &mouse = Mouse::getReference();
OSystem &system = *g_system;
@@ -545,7 +547,7 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) {
}
while (e.pollEvent()) {
- if (e.quitFlag) {
+ if (engine._quit) {
selectedIndex = 0xffff;
goto bail_out;