update(hooks): CGameEventManager

Author: skuzzis

plugin_files/gamedata/signatures.json

@@ -59,11 +59,6 @@
         "windows": "48 8B 15 2A 2A 2A 2A 48 85 D2 74 2A 85 C9 74",
         "linux": "48 8B 05 ? ? ? ? 48 85 C0 74 ? 85 FF"
     },
-    "CGameEventManager_Init": {
-        "lib": "server",
-        "windows": "40 53 48 83 EC 20 48 8B 01 48 8B D9 FF 50 10",
-        "linux": "55 48 89 E5 41 54 49 89 FC 48 83 EC 08 48 8B 07 FF 50 18"
-    },
     "CAttributeList_SetOrAddAttributeValueByName": {
         "lib": "server",
         "windows": "40 53 41 56 41 57 48 81 EC 90 00 00 00 0F 29 74 24 70",

src/entrypoint.cpp

@@ -106,6 +106,7 @@ MenuManager* g_MenuManager = nullptr;
 ResourceMonitor* g_ResourceMonitor = nullptr;
 Patches* g_Patches = nullptr;
 CallStack* g_callStack = nullptr;
+EventManager* eventManager = nullptr;
 VoiceManager g_voiceManager;
 
 //////////////////////////////////////////////////////////////
@@ -162,6 +163,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
     g_MenuManager = new MenuManager();
     g_ResourceMonitor = new ResourceMonitor();
     g_callStack = new CallStack();
+    eventManager = new EventManager();
 
     if (g_Config->LoadConfiguration())
         PRINT("The configurations has been succesfully loaded.\n");
@@ -180,6 +182,7 @@ bool Swiftly::Load(PluginId id, ISmmAPI* ismm, char* error, size_t maxlen, bool
 
     g_addons.LoadAddons();
     g_addons.Initialize();
+    eventManager->Initialize();
 
     if (!InitializeHooks())
         PRINTRET("Hooks failed to initialize.\n", false)
@@ -245,9 +248,9 @@ bool Swiftly::Unload(char* error, size_t maxlen)
     g_pluginManager->UnloadPlugins();
 
     UnloadHooks();
-    UnregisterEventListeners();
     g_voiceManager.OnShutdown();
     g_addons.Destroy();
+    eventManager->Shutdown();
 
     SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, GameFrame, server, this, &Swiftly::Hook_GameFrame, true);
     SH_REMOVE_HOOK_MEMFUNC(IServerGameClients, ClientDisconnect, gameclients, this, &Swiftly::Hook_ClientDisconnect, true);

src/gameevents/gameevents.cpp

@@ -4,62 +4,54 @@
 #include "../plugins/core/scripting.h"
 #include "../plugins/PluginManager.h"
 #include "../player/PlayerManager.h"
+#include "../../vendor/dynlib/module.h"
 
 #include <vector>
 #include <map>
 #include <stack>
 
 SH_DECL_HOOK2(IGameEventManager2, FireEvent, SH_NOATTRIB, 0, bool, IGameEvent*, bool);
-FuncHook<decltype(Hook_CGameEventManager_Init)> TCGameEventManager_Init(Hook_CGameEventManager_Init, "CGameEventManager_Init");
+SH_DECL_HOOK2(IGameEventManager2, LoadEventsFromFile, SH_NOATTRIB, 0, int, const char*, bool);
+int loadEventFromFileHookID = -1;
 
-EventManager* eventManager = nullptr;
 std::stack<IGameEvent*> dupEvents;
 
-void Hook_CGameEventManager_Init(IGameEventManager2* pGameEventManager)
-{
-    g_gameEventManager = pGameEventManager;
-    TCGameEventManager_Init(pGameEventManager);
-
-    PLUGIN_PRINT("Game Events", "Loading game events...\n");
-    RegisterEventListeners();
-    PLUGIN_PRINTF("Game Events", "%d game events have been succesfully loaded.\n", gameEventsRegister.size());
-}
-
-void RegisterEventListeners()
-{
-    if (!g_gameEventManager)
-        return;
-
-    if (!eventManager)
-        eventManager = new EventManager();
-
-    eventManager->Initialize();
-}
-
-void UnregisterEventListeners()
+void EventManager::Initialize()
 {
-    if (!g_gameEventManager)
-        return;
-
-    eventManager->Shutdown();
+    DynLibUtils::CModule servermodule("server");
+    auto CGameEventManagerVTable = servermodule.GetVirtualTableByName("CGameEventManager");
+    loadEventFromFileHookID = SH_ADD_DVPHOOK(IGameEventManager2, LoadEventsFromFile, (IGameEventManager2*)((void*)CGameEventManagerVTable), SH_MEMBER(this, &EventManager::LoadEventsFromFile), false);
 }
 
-void EventManager::Initialize()
+void EventManager::RegisterGameEvents()
 {
-    SH_ADD_HOOK(IGameEventManager2, FireEvent, g_gameEventManager, SH_MEMBER(this, &EventManager::OnFireEvent), false);
-    SH_ADD_HOOK(IGameEventManager2, FireEvent, g_gameEventManager, SH_MEMBER(this, &EventManager::OnPostFireEvent), true);
-
     for (auto it = gameEventsRegister.begin(); it != gameEventsRegister.end(); ++it)
     {
         if (!g_gameEventManager->FindListener(this, it->first.c_str()))
             g_gameEventManager->AddListener(this, it->first.c_str(), true);
     }
 }
 
+int EventManager::LoadEventsFromFile(const char* filePath, bool searchAll)
+{
+    if (!g_gameEventManager) {
+        g_gameEventManager = META_IFACEPTR(IGameEventManager2);
+        PLUGIN_PRINT("Game Events", "Loading game events...\n");
+        this->RegisterGameEvents();
+        PLUGIN_PRINTF("Game Events", "%d game events have been succesfully loaded.\n", gameEventsRegister.size());
+
+        SH_ADD_HOOK(IGameEventManager2, FireEvent, g_gameEventManager, SH_MEMBER(this, &EventManager::OnFireEvent), false);
+        SH_ADD_HOOK(IGameEventManager2, FireEvent, g_gameEventManager, SH_MEMBER(this, &EventManager::OnPostFireEvent), true);
+    }
+
+    RETURN_META_VALUE(MRES_IGNORED, 0);
+}
+
 void EventManager::Shutdown()
 {
     SH_REMOVE_HOOK(IGameEventManager2, FireEvent, g_gameEventManager, SH_MEMBER(this, &EventManager::OnFireEvent), false);
     SH_REMOVE_HOOK(IGameEventManager2, FireEvent, g_gameEventManager, SH_MEMBER(this, &EventManager::OnPostFireEvent), true);
+    SH_REMOVE_HOOK_ID(loadEventFromFileHookID);
 
     g_gameEventManager->RemoveListener(this);
 }

src/gameevents/gameevents.h

@@ -5,11 +5,7 @@
 #include "../entrypoint.h"
 #include <utlvector.h>
 
-typedef void (*FnEventListenerCallback)(IGameEvent *event);
-void Hook_CGameEventManager_Init(IGameEventManager2 *);
-
-void RegisterEventListeners();
-void UnregisterEventListeners();
+typedef void (*FnEventListenerCallback)(IGameEvent* event);
 
 class EventManager : public IGameEventListener2
 {
@@ -19,10 +15,15 @@ class EventManager : public IGameEventListener2
 
     void Initialize();
     void Shutdown();
+    void RegisterGameEvents();
+
+    void FireGameEvent(IGameEvent* pEvent) override;
+    bool OnFireEvent(IGameEvent* pEvent, bool bDontBroadcast);
+    bool OnPostFireEvent(IGameEvent* pEvent, bool bDontBroadcast);
 
-    void FireGameEvent(IGameEvent *pEvent) override;
-    bool OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast);
-    bool OnPostFireEvent(IGameEvent *pEvent, bool bDontBroadcast);
+    int LoadEventsFromFile(const char* filePath, bool searchAll);
 };
 
+extern EventManager* eventManager;
+
 #endif