Merge branch 'master' into TheNormalnij/remove_vtbl

Author: Dutchman101

Client/game_sa/CModelInfoSA.cpp

@@ -801,16 +801,28 @@ void CModelInfoSA::SetTextureDictionaryID(unsigned short usID)
     if (!m_pInterface)
         return;
 
-    // Remove ref from the old TXD
-    CTxdStore_RemoveRef(m_pInterface->usTextureDictionary);
+    // CBaseModelInfo::AddRef adds references to model and TXD
+    // We need transfer added references from old TXD to new TXD
+    size_t referencesCount = m_pInterface->usNumberOfRefs;
+
+    // +1 reference for active rwObject
+    // The current textures will be removed in RpAtomicDestroy
+    // RenderWare uses an additional reference counter per texture
+    if (m_pInterface->pRwObject)
+        referencesCount++;
+
+    for (size_t i = 0; i < referencesCount; i++)
+        CTxdStore_RemoveRef(m_pInterface->usTextureDictionary);
 
     // Store vanilla TXD ID
     if (!MapContains(ms_DefaultTxdIDMap, m_dwModelID))
         ms_DefaultTxdIDMap[m_dwModelID] = m_pInterface->usTextureDictionary;
 
     // Set new TXD and increase ref of it
     m_pInterface->usTextureDictionary = usID;
-    CTxdStore_AddRef(usID);
+
+    for (size_t i = 0; i < referencesCount; i++)
+        CTxdStore_AddRef(usID);
 }
 
 void CModelInfoSA::ResetTextureDictionaryID()

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

@@ -266,8 +266,10 @@ void CRenderWareSA::ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacemen
                 ListRemove(currentTextures, pOriginalTexture);
             }
             assert(currentTextures.empty());
-        #endif
 
+            int32_t refsCount = CTxdStore_GetNumRefs(pInfo->usTxdId);
+            assert(refsCount > 0, "Should have at least one TXD reference here");
+        #endif
             // Remove info
             CTxdStore_RemoveRef(pInfo->usTxdId);
             MapRemove(ms_ModelTexturesInfoMap, usTxdId);

Client/game_sa/CWeaponInfoSA.h

@@ -19,6 +19,7 @@ class CEntitySAInterface;
 // Flame shot array for flamethrower flames and maybe molotovs
 #define ARRAY_CFlameShotInfo                0xC89690
 #define MAX_FLAME_SHOT_INFOS                100
+#define FUNC_CWeaponInfo_GetWeaponReloadTime 0x743D70
 
 class CFlameShotInfo
 {
@@ -88,6 +89,8 @@ class CWeaponInfoSAInterface            // 112 byte long class
     /////////////////////////////////
     BYTE m_defaultCombo;                // base combo for this melee weapon
     BYTE m_nCombosAvailable;            // how many further combos are available
+
+    int GetWeaponReloadTime() { return ((int(__thiscall*)(CWeaponInfoSAInterface*))FUNC_CWeaponInfo_GetWeaponReloadTime)(this); }
 };
 
 class CWeaponInfoSA : public CWeaponInfo