Update actionMap.cpp

Author: marauder2k7

Engine/source/sim/actionMap.cpp

@@ -521,6 +521,47 @@ bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor*
    //
    AssertFatal(dStrlen(pObjectString) != 0, "Error, no key was specified!");
 
+   // rebuild normalized modifier string from parsed flags
+   String newString;
+
+#if defined(TORQUE_OS_MAC)
+
+   if (pDescriptor->flags & SI_ALT)
+      newString += "Cmd";
+
+   if (pDescriptor->flags & SI_MAC_OPT)
+   {
+      if (newString.length()) newString += "-";
+      newString += "Opt";
+   }
+
+#else
+
+   if (pDescriptor->flags & SI_CTRL)
+      newString += "Ctrl";
+
+   if (pDescriptor->flags & SI_ALT)
+   {
+      if (newString.length()) newString += "-";
+      newString += "Alt";
+   }
+
+#endif
+
+   if (pDescriptor->flags & SI_SHIFT)
+   {
+      if (newString.length()) newString += "-";
+      newString += "Shift";
+   }
+
+   // rebuild full event string
+   if (newString.length())
+      newString = String::ToString("%s %s", newString.c_str(), pObjectString).c_str();
+   else
+      newString = String::ToString("%s", pObjectString).c_str();
+
+   dStrcpy(const_cast<char*>(pEventString), newString.c_str(), newString.length()+1);
+
    if (dStrlen(pObjectString) == 1)
    {
       if (dIsDecentChar(*pObjectString)) // includes foreign chars
@@ -573,16 +614,7 @@ bool ActionMap::createEventDescriptor(const char* pEventString, EventDescriptor*
             }
          }
       }
-      // Didn't find an ascii match. Check the virtual map table
-      //for (U32 j = 0; gVirtualMap[j].code != 0xFFFFFFFF; j++)
-      //{
-      //   if (dStricmp(pObjectString, gVirtualMap[j].pDescription) == 0)
-      //   {
-      //      pDescriptor->eventType = gVirtualMap[j].type;
-      //      pDescriptor->eventCode = gVirtualMap[j].code;
-      //      return true;
-      //   }
-      //}
+
       InputEventManager::VirtualMapData* data = INPUTMGR->findVirtualMap(pObjectString);
       if(data)
       {