Adds replacement CJ clothing models

Author: W3lac3

Client/game_sa/CRenderWareSA.ClothesReplacing.cpp

@@ -52,12 +52,12 @@ namespace
 
 ////////////////////////////////////////////////////////////////
 //
-// CRenderWareSA::ClothesAddReplacementTxd
+// CRenderWareSA::ClothesAddReplacement
 //
-// Add replacement txd for a clothing component
+// Add replacement txd/dff for a clothing component
 //
 ////////////////////////////////////////////////////////////////
-void CRenderWareSA::ClothesAddReplacementTxd(char* pFileData, ushort usFileId)
+void CRenderWareSA::ClothesAddReplacement(char* pFileData, ushort usFileId)
 {
     if (!pFileData)
         return;
@@ -70,12 +70,12 @@ void CRenderWareSA::ClothesAddReplacementTxd(char* pFileData, ushort usFileId)
 
 ////////////////////////////////////////////////////////////////
 //
-// CRenderWareSA::ClothesRemoveReplacementTxd
+// CRenderWareSA::ClothesRemoveReplacement
 //
-// Remove replacement txd for a clothing component
+// Remove replacement txd/dff for a clothing component
 //
 ////////////////////////////////////////////////////////////////
-void CRenderWareSA::ClothesRemoveReplacementTxd(char* pFileData)
+void CRenderWareSA::ClothesRemoveReplacement(char* pFileData)
 {
     if (!pFileData)
         return;
@@ -110,7 +110,7 @@ bool CRenderWareSA::HasClothesReplacementChanged()
 // CStreaming_RequestModel_Mid
 //
 // If request is for a file inside player.img (imgId 5)
-// then maybe switch to replacement txd file data
+// then maybe switch to replacement txd/dff file data
 //
 ////////////////////////////////////////////////////////////////
 __declspec(noinline) bool _cdecl OnCStreaming_RequestModel_Mid(int flags, SImgGTAItemInfo* pImgGTAInfo)

Client/game_sa/CRenderWareSA.h

@@ -32,8 +32,8 @@ class CRenderWareSA : public CRenderWare
     bool ModelInfoTXDLoadTextures(SReplacementTextures* pReplacementTextures, const SString& strFilename, const SString& buffer, bool bFilteringEnabled);
     bool ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTextures, ushort usModelId);
     void ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacementTextures);
-    void ClothesAddReplacementTxd(char* pFileData, ushort usFileId);
-    void ClothesRemoveReplacementTxd(char* pFileData);
+    void ClothesAddReplacement(char* pFileData, ushort usFileId);
+    void ClothesRemoveReplacement(char* pFileData);
     bool HasClothesReplacementChanged();
 
     // Reads and parses a TXD file specified by a path (szTXD)

Client/mods/deathmatch/logic/CClientDFF.cpp

@@ -101,6 +101,21 @@ void CClientDFF::UnloadDFF()
 
 bool CClientDFF::ReplaceModel(unsigned short usModel, bool bAlphaTransparency)
 {
+    if (usModel >= CLOTHES_MODEL_ID_FIRST && usModel <= CLOTHES_MODEL_ID_LAST)
+    {
+        if (m_RawDataBuffer.empty() && m_bIsRawData)
+            return false;
+
+        if (m_RawDataBuffer.empty())
+        {
+            if (!FileLoad(std::nothrow, m_strDffFilename, m_RawDataBuffer))
+                return false;
+        }
+
+        g_pGame->GetRenderWare()->ClothesAddReplacement(m_RawDataBuffer.data(), usModel - CLOTHES_MODEL_ID_FIRST);
+        return true;
+    }
+
     // Record attempt in case it all goes wrong
     CArgMap argMap;
     argMap.Set("id", usModel);
@@ -231,6 +246,7 @@ void CClientDFF::RestoreModels()
 
     // Clear the list
     m_Replaced.clear();
+    g_pGame->GetRenderWare()->ClothesRemoveReplacement(m_RawDataBuffer.data());
 }
 
 void CClientDFF::InternalRestoreModel(unsigned short usModel)

Client/mods/deathmatch/logic/CClientTXD.cpp

@@ -29,7 +29,7 @@ CClientTXD::~CClientTXD()
     }
 
     // Remove us from all the clothes replacement doo dah
-    g_pGame->GetRenderWare()->ClothesRemoveReplacementTxd(m_FileData.data());
+    g_pGame->GetRenderWare()->ClothesRemoveReplacement(m_FileData.data());
 }
 
 bool CClientTXD::Load(bool isRaw, SString input, bool enableFiltering)
@@ -75,8 +75,8 @@ bool CClientTXD::Import(unsigned short usModelID)
                 return false;
         }
         m_bUsingFileDataForClothes = true;
-        // Note: ClothesAddReplacementTxd uses the pointer from m_FileData, so don't touch m_FileData until matching ClothesRemove call
-        g_pGame->GetRenderWare()->ClothesAddReplacementTxd(m_FileData.data(), usModelID - CLOTHES_MODEL_ID_FIRST);
+        // Note: ClothesAddReplacement uses the pointer from m_FileData, so don't touch m_FileData until matching ClothesRemove call
+        g_pGame->GetRenderWare()->ClothesAddReplacement(m_FileData.data(), usModelID - CLOTHES_MODEL_ID_FIRST);
         return true;
     }
     else

Client/sdk/game/CRenderWare.h

@@ -76,8 +76,8 @@ class CRenderWare
                                                       bool bFilteringEnabled) = 0;
     virtual bool             ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTextures, ushort usModelId) = 0;
     virtual void             ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacementTextures) = 0;
-    virtual void             ClothesAddReplacementTxd(char* pFileData, ushort usFileId) = 0;
-    virtual void             ClothesRemoveReplacementTxd(char* pFileData) = 0;
+    virtual void             ClothesAddReplacement(char* pFileData, ushort usFileId) = 0;
+    virtual void             ClothesRemoveReplacement(char* pFileData) = 0;
     virtual bool             HasClothesReplacementChanged() = 0;
     virtual RwTexDictionary* ReadTXD(const SString& strFilename, const SString& buffer) = 0;
     virtual RpClump*         ReadDFF(const SString& strFilename, const SString& buffer, unsigned short usModelID, bool bLoadEmbeddedCollisions) = 0;