diff options
| -rw-r--r-- | engines/wage/menu.cpp | 33 | ||||
| -rw-r--r-- | engines/wage/menu.h | 1 | ||||
| -rw-r--r-- | engines/wage/wage.h | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/engines/wage/menu.cpp b/engines/wage/menu.cpp index 2dde420fa4..5bf6fc766f 100644 --- a/engines/wage/menu.cpp +++ b/engines/wage/menu.cpp @@ -484,7 +484,12 @@ bool Menu::mouseMove(int x, int y) { bool Menu::mouseRelease(int x, int y) { if (_menuActivated) { _menuActivated = false; + + if (_activeItem != -1 && _activeSubItem != -1 && _items[_activeItem]->subitems[_activeSubItem]->enabled) + executeCommand(_items[_activeItem]->subitems[_activeSubItem]); + _activeItem = -1; + _activeSubItem = -1; return true; } @@ -492,4 +497,32 @@ bool Menu::mouseRelease(int x, int y) { return false; } +void Menu::executeCommand(MenuSubItem *subitem) { + switch(subitem->action) { + case kMenuActionAbout: + case kMenuActionNew: + case kMenuActionOpen: + case kMenuActionClose: + case kMenuActionSave: + case kMenuActionSaveAs: + case kMenuActionRevert: + case kMenuActionQuit: + + case kMenuActionUndo: + case kMenuActionCut: + case kMenuActionCopy: + case kMenuActionPaste: + case kMenuActionClear: + break; + + case kMenuActionCommand: + _gui->_engine->processTurn(&subitem->text, NULL); + break; + + default: + warning("Unknown action: %d", subitem->action); + + } +} + } // End of namespace Wage diff --git a/engines/wage/menu.h b/engines/wage/menu.h index 62ad835b8e..41696978ff 100644 --- a/engines/wage/menu.h +++ b/engines/wage/menu.h @@ -89,6 +89,7 @@ private: void renderSubmenu(MenuItem *menu); MenuItem *createCommandsMenu(); MenuItem *createWeaponsMenu(); + void executeCommand(MenuSubItem *subitem); Common::Array<MenuItem *> _items; diff --git a/engines/wage/wage.h b/engines/wage/wage.h index 375425b69b..2eb9803695 100644 --- a/engines/wage/wage.h +++ b/engines/wage/wage.h @@ -119,12 +119,12 @@ public: bool canSaveGameStateCurrently(); const char *getGameFile() const; + void processTurn(Common::String *textInput, Designed *clickInput); private: bool loadWorld(Common::MacResManager *resMan); void performInitialSetup(); void wearObjs(Chr *chr); - void processTurn(Common::String *textInput, Designed *clickInput); void processTurnInternal(Common::String *textInput, Designed *clickInput); void regen(); void performCombatAction(Chr *npc, Chr *player); |