Update actionMap.cpp

cross platform actionmapping for popupmenus

Author: marauder2k7

Engine/source/sim/actionMap.cpp

@@ -466,23 +466,52 @@ bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor*
       pObjectString      = pSpace + 1;
       pSpace[0]          = '\0';
 
-      char* pModifier = dStrtok(copyBuffer, "-");
-      while (pModifier != NULL) {
-         if (dStricmp(pModifier, "shift") == 0) {
-            pDescriptor->flags |= SI_SHIFT;
-         } else if (dStricmp(pModifier, "ctrl") == 0) {
-            pDescriptor->flags |= SI_CTRL;
-         } else if (dStricmp(pModifier, "alt") == 0) {
-            pDescriptor->flags |= SI_ALT;
-         } else if (dStricmp(pModifier, "cmd") == 0) {
-            pDescriptor->flags |= SI_ALT;
-         } else if (dStricmp(pModifier, "opt") == 0) {
-            pDescriptor->flags |= SI_MAC_OPT;
-         }
-
-         pModifier = dStrtok(NULL, "-");
-      }
-   } else {
+		char* pModifier = dStrtok(copyBuffer, "-");
+		while (pModifier != NULL)
+		{
+#if defined(TORQUE_OS_MAC)
+			if (dStricmp(pModifier, "ctrl") == 0 || dStricmp(pModifier, "cmd") == 0)
+			{
+				 pDescriptor->flags |= SI_ALT;   // On Mac, map Ctrl/Cmd to the standard Mac command key
+			}
+			else if (dStricmp(pModifier, "shift") == 0)
+			{
+				 pDescriptor->flags |= SI_SHIFT;
+			}
+			else if (dStricmp(pModifier, "alt") == 0)
+			{
+				 if (pDescriptor->flags & SI_ALT)
+					pDescriptor->flags |= SI_MAC_OPT;
+				 else
+					pDescriptor->flags |= SI_ALT;
+			}
+			else if (dStricmp(pModifier, "opt") == 0)
+			{
+				 pDescriptor->flags |= SI_MAC_OPT;
+			}
+#else
+			if (dStricmp(pModifier, "ctrl") == 0)
+			{
+				 pDescriptor->flags |= SI_CTRL;
+			}
+			else if (dStricmp(pModifier, "shift") == 0)
+			{
+				 pDescriptor->flags |= SI_SHIFT;
+			}
+			else if (dStricmp(pModifier, "alt") == 0 || dStricmp(pModifier, "opt") == 0)
+			{
+				 pDescriptor->flags |= SI_ALT;
+			}
+			else if (dStricmp(pModifier, "cmd") == 0)
+			{
+				 pDescriptor->flags |= SI_ALT; // Optional: some Windows scripts might use 'cmd'
+			}
+#endif
+		   pModifier = dStrtok(NULL, "-");
+	   }
+   }
+   else
+   {
       // No.
       pDescriptor->flags = 0;
       pObjectString      = copyBuffer;