aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-01-29 18:31:19 +0100
committerEugene Sandulenko2016-02-14 17:12:55 +0100
commit345effab985f93fdd4f5728fc9f46e58cf64019f (patch)
treeefdb16ce4dea4be5542a133fba5b7ceb3cf3d44f
parentc2341f394895a4dc132b971e2b38660aef975beb (diff)
downloadscummvm-rg350-345effab985f93fdd4f5728fc9f46e58cf64019f.tar.gz
scummvm-rg350-345effab985f93fdd4f5728fc9f46e58cf64019f.tar.bz2
scummvm-rg350-345effab985f93fdd4f5728fc9f46e58cf64019f.zip
WAGE: Implement WageEngine::setMenu()
-rw-r--r--engines/wage/gui.cpp4
-rw-r--r--engines/wage/gui.h1
-rw-r--r--engines/wage/menu.h2
-rw-r--r--engines/wage/wage.cpp6
4 files changed, 10 insertions, 3 deletions
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 967628b3ad..354616b470 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -575,6 +575,10 @@ void Gui::loadFonts() {
delete dat;
}
+void Gui::regenCommandsMenu() {
+ _menu->regenCommandsMenu();
+}
+
void Gui::regenWeaponsMenu() {
_menu->regenWeaponsMenu();
}
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index 45ef50c12a..5f15067063 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -98,6 +98,7 @@ public:
void drawInput();
void setSceneDirty() { _sceneDirty = true; }
const Graphics::Font *getFont(const char *name, Graphics::FontManager::FontUsage fallback);
+ void regenCommandsMenu();
void regenWeaponsMenu();
private:
diff --git a/engines/wage/menu.h b/engines/wage/menu.h
index 62bc252655..82c0106a7b 100644
--- a/engines/wage/menu.h
+++ b/engines/wage/menu.h
@@ -73,6 +73,7 @@ public:
bool mouseRelease(int x, int y);
bool mouseMove(int x, int y);
+ void regenCommandsMenu();
void regenWeaponsMenu();
bool _menuActivated;
@@ -89,7 +90,6 @@ private:
int calculateMenuWidth(MenuItem *menu);
void calcMenuBounds(MenuItem *menu);
void renderSubmenu(MenuItem *menu);
- void regenCommandsMenu();
void createCommandsMenu(MenuItem *menu);
void createWeaponsMenu(MenuItem *menu);
void executeCommand(MenuSubItem *subitem);
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index de5f9e1526..038bef5ed6 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -200,8 +200,10 @@ void WageEngine::playSound(Common::String soundName) {
warning("STUB: WageEngine::playSound(%s)", soundName.c_str());
}
-void WageEngine::setMenu(Common::String soundName) {
- warning("STUB: WageEngine::setMenu");
+void WageEngine::setMenu(Common::String menu) {
+ _world->_commandsMenu = menu;
+
+ _gui->regenCommandsMenu();
}
void WageEngine::appendText(const char *str) {