Revert "Improve addEvent when sharing events over multiple resources (#2333)"

This reverts commit f3811cb.

Author: gta191977649

Client/mods/deathmatch/logic/CEvents.cpp

@@ -28,28 +28,16 @@ bool CEvents::AddEvent(const char* szName, const char* szArguments, CLuaMain* pL
     assert(szName);
     assert(szArguments);
 
-    // Get the event if it already exists
-    SEvent* pEvent = Get(szName);
+    // If it already exists, return
+    if (Get(szName))
+        return false;
 
-    if (pEvent)
-    {
-        // If bAllowRemoteTrigger has been altered, return
-        if (pEvent->bAllowRemoteTrigger != bAllowRemoteTrigger)
-            return false;
-        
-        // Add pLuaMain to the vector, in case it's not already there
-        if (!ListContains(pEvent->pLuaMainVector, pLuaMain))
-            pEvent->pLuaMainVector.push_back(pLuaMain);
-    }
-    else
-    {
-        // Create and add the event
-        pEvent = new SEvent;
-        pEvent->strName = szName;
-        pEvent->strArguments = szArguments;
-        pEvent->pLuaMainVector.push_back(pLuaMain);
-        pEvent->bAllowRemoteTrigger = bAllowRemoteTrigger;
-    }
+    // Create and add the event
+    SEvent* pEvent = new SEvent;
+    pEvent->strName = szName;
+    pEvent->strArguments = szArguments;
+    pEvent->pLuaMain = pLuaMain;
+    pEvent->bAllowRemoteTrigger = bAllowRemoteTrigger;
 
     m_EventHashMap[szName] = pEvent;
 
@@ -92,19 +80,17 @@ void CEvents::RemoveAllEvents(class CLuaMain* pMain)
     while (iter != m_EventHashMap.end())
     {
         SEvent* pEvent = (*iter).second;
-        ListRemoveFirst(pEvent->pLuaMainVector, pMain);
-
-        // If no pMain is left, delete it null it and set the bool
-        if (pEvent->pLuaMainVector.empty())
+        // If they match, delete it null it and set the bool
+        if (pEvent != NULL && pEvent->pLuaMain == pMain)
         {
             // Delete the object
             delete pEvent;
 
             // Remove from list
-            m_EventHashMap.erase(iter);
+            m_EventHashMap.erase(iter++);
         }
-
-        ++iter;
+        else
+            ++iter;
     }
 }
 

Client/mods/deathmatch/logic/CEvents.h

@@ -16,10 +16,10 @@
 
 struct SEvent
 {
-    std::vector<class CLuaMain*> pLuaMainVector;
-    std::string                  strName;
-    std::string                  strArguments;
-    bool                         bAllowRemoteTrigger;
+    class CLuaMain* pLuaMain;
+    std::string     strName;
+    std::string     strArguments;
+    bool            bAllowRemoteTrigger;
 };
 
 class CEvents

Server/mods/deathmatch/logic/CEvents.cpp

@@ -22,28 +22,16 @@ bool CEvents::AddEvent(const char* szName, const char* szArguments, CLuaMain* pL
     assert(szName);
     assert(szArguments);
 
-    // Get the event if it already exists
-    SEvent* pEvent = Get(szName);
+    // If it already exists, return
+    if (Get(szName))
+        return false;
 
-    if (pEvent)
-    {
-        // If bAllowRemoteTrigger has been altered, return
-        if (pEvent->bAllowRemoteTrigger != bAllowRemoteTrigger)
-            return false;
-        
-        // Add pLuaMain to the vector, in case it's not already there
-        if (!ListContains(pEvent->pLuaMainVector, pLuaMain))
-            pEvent->pLuaMainVector.push_back(pLuaMain);
-    }
-    else
-    {
-        // Create and add the event
-        pEvent = new SEvent;
-        pEvent->strName = szName;
-        pEvent->strArguments = szArguments;
-        pEvent->pLuaMainVector.push_back(pLuaMain);
-        pEvent->bAllowRemoteTrigger = bAllowRemoteTrigger;
-    }
+    // Create and add the event
+    SEvent* pEvent = new SEvent;
+    pEvent->strName = szName;
+    pEvent->strArguments = szArguments;
+    pEvent->pLuaMain = pLuaMain;
+    pEvent->bAllowRemoteTrigger = bAllowRemoteTrigger;
 
     m_EventHashMap[szName] = pEvent;
 
@@ -80,19 +68,17 @@ void CEvents::RemoveAllEvents(class CLuaMain* pMain)
     while (iter != m_EventHashMap.end())
     {
         SEvent* pEvent = (*iter).second;
-        ListRemoveFirst(pEvent->pLuaMainVector, pMain);
-
-        // If no pMain is left, delete it null it and set the bool
-        if (pEvent->pLuaMainVector.empty())
+        // If they match, delete it null it and set the bool
+        if (pEvent->pLuaMain == pMain)
         {
             // Delete the object
             delete pEvent;
 
             // Remove from list
-            m_EventHashMap.erase(iter);
+            m_EventHashMap.erase(iter++);
         }
-
-        ++iter;
+        else
+            ++iter;
     }
 }
 

Server/mods/deathmatch/logic/CEvents.h

@@ -17,10 +17,10 @@
 
 struct SEvent
 {
-    std::vector<class CLuaMain*> pLuaMainVector;
-    std::string                  strName;
-    std::string                  strArguments;
-    bool                         bAllowRemoteTrigger;
+    class CLuaMain* pLuaMain;
+    std::string     strName;
+    std::string     strArguments;
+    bool            bAllowRemoteTrigger;
 };
 
 class CEvents