Reverting previous change due to overhaul of script system

gameplay/src/PhysicsController.cpp

@@ -484,8 +484,7 @@ void PhysicsController::update(float elapsedTime)
     _world->stepSimulation(elapsedTime * 0.001f, 10);
 
     // If we have status listeners, then check if our status has changed.
-    static const std::string statusEventId = "statusEvent";
-    if (_listeners || _callbacks[statusEventId])
+    if (_listeners || _callbacks["statusEvent"])
     {
         Listener::EventType oldStatus = _status;
 

gameplay/src/ScriptTarget.cpp

@@ -25,9 +25,7 @@ template<> void ScriptTarget::fireScriptEvent<void>(const char* eventName, ...)
     va_list list;
     va_start(list, eventName);
 
-    static std::string searchString;
-    searchString = eventName;
-    std::map<std::string, std::vector<Callback>* >::iterator iter = _callbacks.find(searchString);
+    std::map<std::string, std::vector<Callback>* >::iterator iter = _callbacks.find(eventName);
     if (iter != _callbacks.end() && iter->second != NULL)
     {
         ScriptController* sc = Game::getInstance()->getScriptController();
@@ -56,9 +54,7 @@ template<> bool ScriptTarget::fireScriptEvent<bool>(const char* eventName, ...)
     va_list list;
     va_start(list, eventName);
 
-    static std::string searchString;
-    searchString = eventName;
-    std::map<std::string, std::vector<Callback>* >::iterator iter = _callbacks.find(searchString);
+    std::map<std::string, std::vector<Callback>* >::iterator iter = _callbacks.find(eventName);
     if (iter != _callbacks.end() && iter->second)
     {
         ScriptController* sc = Game::getInstance()->getScriptController();