diff options
| author | Filippos Karapetis | 2009-09-24 06:53:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-24 06:53:03 +0000 |
| commit | a70351e5ea92d1095097ef6fe77911aa530d1043 (patch) | |
| tree | c1c0dcde93500ec6895069cca7b899036f760760 /engines/lure/menu.cpp | |
| parent | f6cdfde2f7b697d82839f9106468e55cec149679 (diff) | |
| download | scummvm-rg350-a70351e5ea92d1095097ef6fe77911aa530d1043.tar.gz scummvm-rg350-a70351e5ea92d1095097ef6fe77911aa530d1043.tar.bz2 scummvm-rg350-a70351e5ea92d1095097ef6fe77911aa530d1043.zip | |
Changed some references from LureEngine to the global g_engine (e.g. calls to shouldQuit()), to minimize places where LureEngine is referenced
svn-id: r44290
Diffstat (limited to 'engines/lure/menu.cpp')
| -rw-r--r-- | engines/lure/menu.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 5027e6967e..863ca33f75 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -116,7 +116,6 @@ 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(); @@ -131,7 +130,7 @@ uint8 Menu::execute() { while (mouse.lButton() || mouse.rButton()) { while (events.pollEvent()) { - if (engine.shouldQuit()) return MENUITEM_NONE; + if (g_engine->shouldQuit()) return MENUITEM_NONE; if (mouse.y() < MENUBAR_Y_SIZE) { MenuRecord *p = getMenuAt(mouse.x()); @@ -468,7 +467,6 @@ 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; @@ -547,7 +545,7 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) { } while (e.pollEvent()) { - if (engine.shouldQuit()) { + if (g_engine->shouldQuit()) { selectedIndex = 0xffff; goto bail_out; |