From 6590f2c3f7ab594ae728409d6dca3251b36798cf Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 21 Dec 2015 13:14:11 +0100 Subject: [PATCH] WAGE: Added stubs for menu loading --- engines/wage/entities.cpp | 2 -- engines/wage/world.cpp | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp index d75a348bbc3e..c499283e076c 100644 --- a/engines/wage/entities.cpp +++ b/engines/wage/entities.cpp @@ -62,8 +62,6 @@ Scene::Scene(String name, Common::SeekableReadStream *data) { _name = name; _design = new Design(data); - warning("Scene %s", _name.c_str()); - setDesignBounds(readRect(data)); _worldY = data->readSint16BE(); _worldX = data->readSint16BE(); diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp index d84f31bfe492..0fd31c6232b2 100644 --- a/engines/wage/world.cpp +++ b/engines/wage/world.cpp @@ -230,7 +230,33 @@ bool World::loadWorld(Common::MacResManager *resMan) { _patterns.push_back(pattern); } } + delete res; + } + + res = resMan->getResource(MKTAG('M','E','N','U'), 2001); + if (res != NULL) { + warning("STUB: aboutMenu"); + //String aboutMenuItemName = appleMenu[1].split(";")[0]; + //world.setAboutMenuItemName(aboutMenuItemName); + delete res; + } + res = resMan->getResource(MKTAG('M','E','N','U'), 2004); + if (res != NULL) { + warning("STUB: commandsMenu"); + //world.setCommandsMenuName(commandsMenu[0]); + //world.setDefaultCommandsMenu(commandsMenu[1]); + delete res; + } + res = resMan->getResource(MKTAG('M','E','N','U'), 2005); + if (res != NULL) { + warning("STUB: weaponsMenu"); + //world.setWeaponsMenuName(weaponsMenu[0]); + delete res; } + // TODO: Read Apple menu and get the name of that menu item.. + + // store global info in state object for use with save/load actions + //world.setCurrentState(initialState); // pass off the state object to the world return true; }