diff options
author | Strangerke | 2013-03-19 20:40:55 +0100 |
---|---|---|
committer | Strangerke | 2013-03-19 20:41:39 +0100 |
commit | db6d7e256bd1a1654002005fec3524ddcd300c75 (patch) | |
tree | e20128bc144b1b11899af51a73b1ba6d9b4f48e8 /engines/hopkins/menu.cpp | |
parent | fa3136fbc4385f1f14a87f21dfa2e7bf82aac66d (diff) | |
download | scummvm-rg350-db6d7e256bd1a1654002005fec3524ddcd300c75.tar.gz scummvm-rg350-db6d7e256bd1a1654002005fec3524ddcd300c75.tar.bz2 scummvm-rg350-db6d7e256bd1a1654002005fec3524ddcd300c75.zip |
HOPKINS: Remove setParent() from EventsManager and Debugger
Diffstat (limited to 'engines/hopkins/menu.cpp')
-rw-r--r-- | engines/hopkins/menu.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp index d5cf110a82..eb3f7ef1db 100644 --- a/engines/hopkins/menu.cpp +++ b/engines/hopkins/menu.cpp @@ -56,7 +56,7 @@ int MenuManager::menu() { result = 0; while (!g_system->getEventManager()->shouldQuit()) { _vm->_objectsManager._forestFl = false; - _vm->_eventsManager._breakoutFl = false; + _vm->_eventsManager->_breakoutFl = false; _vm->_globals._disableInventFl = true; _vm->_globals._exitId = 0; @@ -87,10 +87,10 @@ int MenuManager::menu() { else if (_vm->_globals._language == LANG_SP) spriteData = _vm->_objectsManager.loadSprite("MENUES.SPR"); - _vm->_eventsManager.mouseOn(); - _vm->_eventsManager.changeMouseCursor(0); - _vm->_eventsManager._mouseCursorId = 0; - _vm->_eventsManager._mouseSpriteId = 0; + _vm->_eventsManager->mouseOn(); + _vm->_eventsManager->changeMouseCursor(0); + _vm->_eventsManager->_mouseCursorId = 0; + _vm->_eventsManager->_mouseSpriteId = 0; _vm->_soundManager.playSound(28); @@ -101,7 +101,7 @@ int MenuManager::menu() { return -1; menuIndex = MENU_NONE; - mousePos = Common::Point(_vm->_eventsManager.getMouseX(), _vm->_eventsManager.getMouseY()); + mousePos = Common::Point(_vm->_eventsManager->getMouseX(), _vm->_eventsManager->getMouseY()); if (mousePos.x >= 232 && mousePos.x <= 408) { if (mousePos.y >= 261 && mousePos.y <= 284) @@ -125,16 +125,16 @@ int MenuManager::menu() { _vm->_graphicsManager.fastDisplay(spriteData, 230, 322, frameIndex[2] + 4); _vm->_graphicsManager.fastDisplay(spriteData, 230, 354, frameIndex[3] + 6); _vm->_graphicsManager.fastDisplay(spriteData, 230, 386, frameIndex[4] + 8); - _vm->_eventsManager.refreshScreenAndEvents(); + _vm->_eventsManager->refreshScreenAndEvents(); - if (_vm->_eventsManager.getMouseButton() == 1 && menuIndex != MENU_NONE) + if (_vm->_eventsManager->getMouseButton() == 1 && menuIndex != MENU_NONE) selectionMade = true; } while (!selectionMade); if (menuIndex > MENU_NONE) { _vm->_graphicsManager.fastDisplay(spriteData, 230, 259 + 32 * (menuIndex - 1), 10 + (menuIndex - 1)); - _vm->_eventsManager.refreshScreenAndEvents(); - _vm->_eventsManager.delay(200); + _vm->_eventsManager->refreshScreenAndEvents(); + _vm->_eventsManager->delay(200); } if (menuIndex == PLAY_GAME) { |