Automatically reload models for markers (PR #3059)

multitheftauto · Sep 19, 2023 · f382cfb · f382cfb
1 parent 1a88646
commit f382cfb
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 0 deletions.
diff --git a/Client/game_sa/C3DMarkersSA.cpp b/Client/game_sa/C3DMarkersSA.cpp
@@ -99,3 +99,15 @@ C3DMarker* C3DMarkersSA::FindMarker(DWORD Identifier)
     }
     return NULL;
 }
+
+void C3DMarkersSA::ReinitMarkers()
+{
+    using Function_ShutdownMarkers = void(__cdecl *)();
+    auto shutdownMarkers = reinterpret_cast<Function_ShutdownMarkers>(0x722710);
+
+    using Function_InitMarkers = void(__cdecl*)();
+    auto initMarkers = reinterpret_cast<Function_InitMarkers>(0x724E40);
+
+    shutdownMarkers();
+    initMarkers();
+}
diff --git a/Client/game_sa/C3DMarkersSA.h b/Client/game_sa/C3DMarkersSA.h
@@ -31,4 +31,5 @@ class C3DMarkersSA : public C3DMarkers
     C3DMarker* CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, float fSize, float fPulseFraction, BYTE r, BYTE g, BYTE b, BYTE a);
     C3DMarker* FindFreeMarker();
     C3DMarker* FindMarker(DWORD Identifier);
+    void       ReinitMarkers();
 };
diff --git a/Client/mods/deathmatch/logic/CClientDFF.cpp b/Client/mods/deathmatch/logic/CClientDFF.cpp
@@ -164,6 +164,16 @@ bool CClientDFF::DoReplaceModel(unsigned short usModel, bool bAlphaTransparency)
         {
             return ReplacePedModel(pClump, usModel, bAlphaTransparency);
         }
+        else if (CClientMarkerManager::IsMarkerModel(usModel))
+        {
+            bool wasReplaced = ReplaceObjectModel(pClump, usModel, bAlphaTransparency);
+
+            // 'Restream' 3D markers
+            if (wasReplaced)
+                g_pClientGame->ReinitMarkers();
+
+            return wasReplaced;
+        }
         else if (CClientObjectManager::IsValidModel(usModel))
         {
             if (CVehicleUpgrades::IsUpgrade(usModel))
@@ -272,6 +282,10 @@ void CClientDFF::InternalRestoreModel(unsigned short usModel)
     if (CClientObjectManager::IsValidModel(usModel) && CVehicleUpgrades::IsUpgrade(usModel))
         m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(usModel);
 
+    // 'Restream' 3D markers
+    if (CClientMarkerManager::IsMarkerModel(usModel))
+        g_pClientGame->ReinitMarkers();
+
     // Force dff reload if this model id is used again
     SLoadedClumpInfo* pInfo = MapFind(m_LoadedClumpInfoMap, usModel);
     if (pInfo)

diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -5438,6 +5438,8 @@ void CClientGame::ResetMapInfo()
         pPlayerInfo->SetCamDrunkLevel(static_cast<byte>(0));
 
     RestreamWorld(true);
+
+    ReinitMarkers();
 }
 
 void CClientGame::SendPedWastedPacket(CClientPed* Ped, ElementID damagerID, unsigned char ucWeapon, unsigned char ucBodyPiece, AssocGroupId animGroup,
@@ -6649,6 +6651,11 @@ void CClientGame::RestreamWorld(bool removeBigBuildings)
     g_pGame->GetStreaming()->ReinitStreaming();
 }
 
+void CClientGame::ReinitMarkers()
+{
+    g_pGame->Get3DMarkers()->ReinitMarkers();
+}
+
 void CClientGame::OnWindowFocusChange(bool state)
 {
     if (state == m_bFocused)

diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -443,6 +443,7 @@ class CClientGame
     bool TriggerBrowserRequestResultEvent(const std::unordered_set<SString>& newPages);
     void RestreamModel(unsigned short usModel);
     void RestreamWorld(bool removeBigBuildings);
+    void ReinitMarkers();
 
     void OnWindowFocusChange(bool state);
 

diff --git a/Client/mods/deathmatch/logic/CClientMarkerManager.cpp b/Client/mods/deathmatch/logic/CClientMarkerManager.cpp
@@ -62,3 +62,8 @@ void CClientMarkerManager::DoPulse()
     }
     m_Markers.ResumeModifyOperations();
 }
+
+bool CClientMarkerManager::IsMarkerModel(unsigned short usModel)
+{
+    return (usModel == 1316 || usModel == 1317 || usModel == 1559);
+}
diff --git a/Client/mods/deathmatch/logic/CClientMarkerManager.h b/Client/mods/deathmatch/logic/CClientMarkerManager.h
@@ -23,6 +23,7 @@ class CClientMarkerManager
     unsigned int          Count() { return static_cast<unsigned int>(m_Markers.size()); };
     static CClientMarker* Get(ElementID ID);
     void                  DeleteAll();
+    static bool           IsMarkerModel(unsigned short usModel);
 
 private:
     CClientMarkerManager(class CClientManager* pManager);

diff --git a/Client/sdk/game/C3DMarkers.h b/Client/sdk/game/C3DMarkers.h
@@ -22,4 +22,5 @@ class C3DMarkers
     virtual C3DMarker* CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, float fSize, float fPulseFraction, BYTE r, BYTE g, BYTE b,
                                     BYTE a) = 0;
     virtual C3DMarker* FindFreeMarker() = 0;
+    virtual void       ReinitMarkers() = 0;
 };