[Scummvm-git-logs] scummvm master -> 97ed6a2af73608dad953e740f58432921a6ac700

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
97ed6a2af7 GRAPHICS: MACGUI: Pass command id when creating menu to avoid namespace clashes


Commit: 97ed6a2af73608dad953e740f58432921a6ac700
    https://github.com/scummvm/scummvm/commit/97ed6a2af73608dad953e740f58432921a6ac700
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-21T19:40:05+02:00

Commit Message:
GRAPHICS: MACGUI: Pass command id when creating menu to avoid namespace clashes

This fixes Command menu in WAGE.

Changed paths:
    engines/wage/gui.cpp
    graphics/macgui/macmenu.cpp
    graphics/macgui/macmenu.h


diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 53f83bb..ffc4e41 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -199,7 +199,7 @@ bool Gui::processSceneEvents(WindowClick click, Common::Event &event) {
 // Menu stuff
 ////////////////
 void Gui::regenCommandsMenu() {
-	_menu->createSubMenuFromString(_commandsMenuId, _engine->_world->_commandsMenu.c_str());
+	_menu->createSubMenuFromString(_commandsMenuId, _engine->_world->_commandsMenu.c_str(), kMenuActionCommand);
 }
 
 void Gui::regenWeaponsMenu() {
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index dcf2e20..cecdcab 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -56,11 +56,6 @@ enum {
 	kFontStyleExtended = 64
 };
 
-enum {
-	kMenuActionCommand
-};
-
-
 struct MacMenuSubItem {
 	Common::String text;
 	int action;
@@ -216,7 +211,7 @@ void MacMenu::clearSubMenu(int id) {
 	menu->subitems.clear();
 }
 
-void MacMenu::createSubMenuFromString(int id, const char *str) {
+void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) {
 	clearSubMenu(id);
 
 	MacMenuItem *menu = _items[id];
@@ -278,7 +273,7 @@ void MacMenu::createSubMenuFromString(int id, const char *str) {
 					}
 			}
 
-			menu->subitems.push_back(new MacMenuSubItem(item.c_str(), kMenuActionCommand, style, shortcut, enabled));
+			menu->subitems.push_back(new MacMenuSubItem(item.c_str(), commandId, style, shortcut, enabled));
 		}
 
 		item.clear();
diff --git a/graphics/macgui/macmenu.h b/graphics/macgui/macmenu.h
index a25b65a..8b3e8ff 100644
--- a/graphics/macgui/macmenu.h
+++ b/graphics/macgui/macmenu.h
@@ -52,7 +52,7 @@ public:
 
 	int addMenuItem(const char *name);
 	void addMenuSubItem(int id, const char *text, int action, int style = 0, char shortcut = 0, bool enabled = true);
-	void createSubMenuFromString(int id, const char *string);
+	void createSubMenuFromString(int id, const char *string, int commandId);
 	void clearSubMenu(int id);
 
 	bool draw(ManagedSurface *g, bool forceRedraw = false);