Update due to code revision

Author: W3lac3

Client/mods/deathmatch/logic/CClientDFF.cpp

@@ -101,21 +101,6 @@ 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);
@@ -154,6 +139,9 @@ bool CClientDFF::DoReplaceModel(unsigned short usModel, bool bAlphaTransparency)
     if (!CClientDFFManager::IsReplacableModel(usModel))
         return false;
 
+    if (CClientPlayerClothes::IsValidModel(usModel))
+        return ReplaceClothes(usModel);
+
     // Get clump loaded for this model id
     RpClump* pClump = GetLoadedClump(usModel);
 
@@ -246,7 +234,6 @@ void CClientDFF::RestoreModels()
 
     // Clear the list
     m_Replaced.clear();
-    g_pGame->GetRenderWare()->ClothesRemoveReplacement(m_RawDataBuffer.data());
 }
 
 void CClientDFF::InternalRestoreModel(unsigned short usModel)
@@ -284,6 +271,12 @@ void CClientDFF::InternalRestoreModel(unsigned short usModel)
         m_pManager->GetObjectManager()->RestreamObjects(usModel);
         g_pGame->GetModelInfo(usModel)->RestreamIPL();
     }
+    // Is This a clothe ID?
+    else if (CClientPlayerClothes::IsValidModel(usModel))
+    {
+        g_pGame->GetRenderWare()->ClothesRemoveReplacement(m_RawDataBuffer.data());
+        return;
+    }
     else
         return;
 
@@ -312,6 +305,22 @@ void CClientDFF::InternalRestoreModel(unsigned short usModel)
     }
 }
 
+bool CClientDFF::ReplaceClothes(ushort usModel)
+{
+    if (m_RawDataBuffer.empty() && m_bIsRawData)
+        return false;
+
+    if (m_RawDataBuffer.empty())
+    {
+        if (!FileLoad(std::nothrow, m_strDffFilename, m_RawDataBuffer))
+            return false;
+    }
+
+    m_Replaced.push_back(usModel);
+    g_pGame->GetRenderWare()->ClothesAddReplacement(m_RawDataBuffer.data(), usModel - CLOTHES_MODEL_ID_FIRST);
+    return true;
+}
+
 bool CClientDFF::ReplaceObjectModel(RpClump* pClump, ushort usModel, bool bAlphaTransparency)
 {
     // Stream out all the object models with matching ID.

Client/mods/deathmatch/logic/CClientDFF.h

@@ -59,6 +59,7 @@ class CClientDFF final : public CClientEntity
     void UnloadDFF();
     void InternalRestoreModel(unsigned short usModel);
 
+    bool ReplaceClothes(ushort usModel);
     bool ReplaceObjectModel(RpClump* pClump, ushort usModel, bool bAlphaTransparency);
     bool ReplaceVehicleModel(RpClump* pClump, ushort usModel, bool bAlphaTransparency);
     bool ReplaceWeaponModel(RpClump* pClump, ushort usModel, bool bAlphaTransparency);

Client/mods/deathmatch/logic/CClientDFFManager.cpp

@@ -79,7 +79,8 @@ CClientDFF* CClientDFFManager::GetElementThatReplaced(unsigned short usModel, CC
 bool CClientDFFManager::IsReplacableModel(unsigned short usModel)
 {
     // Either a vehicle model or an object model
-    return CClientObjectManager::IsValidModel(usModel) || CClientVehicleManager::IsValidModel(usModel) || CClientPlayerManager::IsValidModel(usModel);
+    return CClientObjectManager::IsValidModel(usModel) || CClientVehicleManager::IsValidModel(usModel) || CClientPlayerManager::IsValidModel(usModel) ||
+           CClientPlayerClothes::IsValidModel(usModel);
 }
 
 bool CClientDFFManager::RestoreModel(unsigned short usModel)

Client/mods/deathmatch/logic/CClientPlayerClothes.cpp

@@ -577,3 +577,8 @@ const int CClientPlayerClothes::GetClothingGroupMax(unsigned char ucType)
 
     return 0;
 }
+
+bool CClientPlayerClothes::IsValidModel(unsigned short usModel)
+{
+    return usModel >= CLOTHES_MODEL_ID_FIRST && usModel <= CLOTHES_MODEL_ID_LAST;
+}

Client/mods/deathmatch/logic/CClientPlayerClothes.h

@@ -67,7 +67,7 @@ class CClientPlayerClothes
 
     static const SPlayerClothing* GetClothingGroup(unsigned char ucType);
     static const int              GetClothingGroupMax(unsigned char ucType);
-
+    static bool                   IsValidModel(unsigned short usModel);
 private:
     static const SPlayerClothing* GetClothing(const char* szTexture, const char* szModel, unsigned char ucType);