diff options
| author | Eugene Sandulenko | 2017-01-14 13:17:38 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-14 13:17:38 +0100 |
| commit | 0ecaa79f08d7cf4caed3f274a728906de5e2115a (patch) | |
| tree | 33b8d4055468fc05c5aed033a623f1ae93742451 /engines | |
| parent | 8690fe444e6959bc2aa17ba7517303dbceda86c8 (diff) | |
| download | scummvm-rg350-0ecaa79f08d7cf4caed3f274a728906de5e2115a.tar.gz scummvm-rg350-0ecaa79f08d7cf4caed3f274a728906de5e2115a.tar.bz2 scummvm-rg350-0ecaa79f08d7cf4caed3f274a728906de5e2115a.zip | |
GRAPHICS: Renamed Menu to MacMenu to avoid potential name collision
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/macventure/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/macventure/gui.h | 2 | ||||
| -rw-r--r-- | engines/wage/gui.cpp | 2 | ||||
| -rw-r--r-- | engines/wage/gui.h | 2 | ||||
| -rw-r--r-- | engines/wage/world.cpp | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 87d51619d8..0008e34afa 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -68,7 +68,7 @@ enum { const bool kLoadStaticMenus = true; -static const Graphics::MenuData menuSubItems[] = { +static const Graphics::MacMenuData menuSubItems[] = { { kMenuHighLevel, "File", 0, 0, false }, { kMenuHighLevel, "Edit", 0, 0, false }, { kMenuHighLevel, "Special", 0, 0, false }, diff --git a/engines/macventure/gui.h b/engines/macventure/gui.h index b57e00fa1b..fa27e16f1e 100644 --- a/engines/macventure/gui.h +++ b/engines/macventure/gui.h @@ -183,7 +183,7 @@ private: // Attributes Graphics::MacWindow *_exitsWindow; Graphics::MacWindow *_diplomaWindow; Common::Array<Graphics::MacWindow*> _inventoryWindows; - Graphics::Menu *_menu; + Graphics::MacMenu *_menu; Dialog *_dialog; Container *_graphics; diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index e43406085d..130747c389 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -61,7 +61,7 @@ namespace Wage { -static const Graphics::MenuData menuSubItems[] = { +static const Graphics::MacMenuData menuSubItems[] = { { kMenuHighLevel, "File", 0, 0, false }, { kMenuHighLevel, "Edit", 0, 0, false }, { kMenuFile, "New", kMenuActionNew, 0, false }, diff --git a/engines/wage/gui.h b/engines/wage/gui.h index cf76c64fe9..10eb782f01 100644 --- a/engines/wage/gui.h +++ b/engines/wage/gui.h @@ -179,7 +179,7 @@ public: private: Graphics::ManagedSurface _console; - Graphics::Menu *_menu; + Graphics::MacMenu *_menu; bool _sceneDirty; bool _consoleDirty; diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp index 9118c8b5bc..465240a23c 100644 --- a/engines/wage/world.cpp +++ b/engines/wage/world.cpp @@ -296,7 +296,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { res = resMan->getResource(MKTAG('M','E','N','U'), 2001); if (res != NULL) { - Common::StringArray *menu = Graphics::Menu::readMenuFromResource(res); + Common::StringArray *menu = Graphics::MacMenu::readMenuFromResource(res); _aboutMenuItemName.clear(); Common::String string = menu->operator[](1); @@ -308,7 +308,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { } res = resMan->getResource(MKTAG('M','E','N','U'), 2004); if (res != NULL) { - Common::StringArray *menu = Graphics::Menu::readMenuFromResource(res); + Common::StringArray *menu = Graphics::MacMenu::readMenuFromResource(res); _commandsMenuName = menu->operator[](0); _commandsMenu = menu->operator[](1); delete menu; @@ -316,7 +316,7 @@ bool World::loadWorld(Common::MacResManager *resMan) { } res = resMan->getResource(MKTAG('M','E','N','U'), 2005); if (res != NULL) { - Common::StringArray *menu = Graphics::Menu::readMenuFromResource(res); + Common::StringArray *menu = Graphics::MacMenu::readMenuFromResource(res); _weaponsMenuName = menu->operator[](0); delete menu; delete res; |