diff options
| -rw-r--r-- | engines/illusions/duckman/menusystem_duckman.cpp | 19 | ||||
| -rw-r--r-- | engines/illusions/textdrawer.cpp | 4 |
2 files changed, 17 insertions, 6 deletions
diff --git a/engines/illusions/duckman/menusystem_duckman.cpp b/engines/illusions/duckman/menusystem_duckman.cpp index e16e0a218a..5ac5e29a56 100644 --- a/engines/illusions/duckman/menusystem_duckman.cpp +++ b/engines/illusions/duckman/menusystem_duckman.cpp @@ -81,6 +81,8 @@ BaseMenu *DuckmanMenuSystem::createMenuById(int menuId) { return createQueryQuitMenu(); case kDuckmanSaveCompleteMenu: return createSaveCompleteMenu(); + case kDuckmanOptionsMenu: + return createOptionsMenu(); default: error("DuckmanMenuSystem::createMenuById() Invalid menu id %d", menuId); } @@ -100,18 +102,27 @@ BaseMenu *DuckmanMenuSystem::createLoadGameMenu() { } BaseMenu *DuckmanMenuSystem::createOptionsMenu() { - return 0; // TODO + BaseMenu *menu = new BaseMenu(this, 0x00120003, 12, 17, 11, 27, 1); + menu->addText(" GAME OPTIONS"); + menu->addText("--------------------------------------"); + menu->addMenuItem(new MenuItem("SFX Volume @@{~~~~~~~~~~~~|~~~}", new MenuActionReturnChoice(this, 21))); + menu->addMenuItem(new MenuItem("Music Volume @@@{~~~~~~~~~~~~|~~~}", new MenuActionReturnChoice(this, 21))); + menu->addMenuItem(new MenuItem("Speech Volume {~~~~~~~~~~~~|~~~}", new MenuActionReturnChoice(this, 21))); + menu->addMenuItem(new MenuItem("Text Duration @@@{~~~~~~~~~~~~|~~~}", new MenuActionReturnChoice(this, 21))); + menu->addMenuItem(new MenuItem("Restore Defaults", new MenuActionReturnChoice(this, 21))); + menu->addMenuItem(new MenuItem("Back", new MenuActionLeaveMenu(this))); + return menu; } BaseMenu *DuckmanMenuSystem::createPauseMenu() { BaseMenu *menu = new BaseMenu(this, 0x00120003, 12, 17, 11, 27, 1); menu->addText(" Game Paused"); - menu->addText("-------------------"); + menu->addText("--------------------"); menu->addMenuItem(new MenuItem("Resume", new MenuActionReturnChoice(this, 21))); menu->addMenuItem(new MenuItem("Load Game", new MenuActionLoadGame(this, 1))); menu->addMenuItem(new MenuItem("Save Game", new MenuActionSaveGame(this, 11))); - // TODO menu->addMenuItem(new MenuItem("Restart Game", new MenuActionEnterQueryMenu(this, kDuckmanQueryRestartMenu, 2))); - // TODO menu->addMenuItem(new MenuItem("Options", new MenuActionEnterMenu(this, kDuckmanOptionsMenu))); + menu->addMenuItem(new MenuItem("Restart Game", new MenuActionEnterQueryMenu(this, kDuckmanQueryRestartMenu, 2))); + menu->addMenuItem(new MenuItem("Options", new MenuActionEnterMenu(this, kDuckmanOptionsMenu))); menu->addMenuItem(new MenuItem("Quit Game", new MenuActionEnterQueryMenu(this, kDuckmanQueryQuitMenu, 23))); return menu; } diff --git a/engines/illusions/textdrawer.cpp b/engines/illusions/textdrawer.cpp index 2456fe433c..e562732486 100644 --- a/engines/illusions/textdrawer.cpp +++ b/engines/illusions/textdrawer.cpp @@ -28,7 +28,7 @@ namespace Illusions { bool TextDrawer::wrapText(FontResource *font, uint16 *text, WidthHeight *dimensions, Common::Point offsPt, uint textFlags, uint16 *&outTextPtr) { - _font = font; + _font = font; _text = text; _dimensions = dimensions; _offsPt = offsPt; @@ -52,7 +52,7 @@ void TextDrawer::drawText(Screen *screen, Graphics::Surface *surface, uint16 col debugN("%c", c); } debug(" "); -#endif +#endif } } |