Update due to code revision

- Change uint16 to std::uint16_t>
- Change the type of the variable g_clothesDirectory to auto

Author: W3lac3

Client/game_sa/CDirectorySA.cpp

@@ -24,7 +24,7 @@ DirectoryInfoSA* CDirectorySAInterface::GetModelEntry(std::uint16_t modelId)
     return entry;
 }
 
-bool CDirectorySAInterface::SetModelStreamingSize(std::uint16_t modelId, uint16 size)
+bool CDirectorySAInterface::SetModelStreamingSize(std::uint16_t modelId, std::uint16_t size)
 {
     DirectoryInfoSA* entry = GetModelEntry(modelId);
 
@@ -39,7 +39,7 @@ bool CDirectorySAInterface::SetModelStreamingSize(std::uint16_t modelId, uint16
 }
 
 
-uint16 CDirectorySAInterface::GetModelStreamingSize(std::uint16_t modelId)
+std::uint16_t CDirectorySAInterface::GetModelStreamingSize(std::uint16_t modelId)
 {
     DirectoryInfoSA* entry = GetModelEntry(modelId);
 

Client/game_sa/CDirectorySA.h

@@ -22,8 +22,8 @@ class CDirectorySAInterface
 {
     public:
         DirectoryInfoSA* GetModelEntry(std::uint16_t modelId);
-        bool             SetModelStreamingSize(std::uint16_t modelId, uint16 size);
-        uint16           GetModelStreamingSize(std::uint16_t modelId);
+        bool             SetModelStreamingSize(std::uint16_t modelId, std::uint16_t size);
+        std::uint16_t    GetModelStreamingSize(std::uint16_t modelId);
 
     private:
         DirectoryInfoSA* m_pEntries{};

Client/game_sa/CRenderWareSA.ClothesReplacing.cpp

@@ -29,8 +29,8 @@ namespace
         uint uiLoadflag;            // 0-not loaded  2-requested  3-loaded  1-processed
     };
 
-    std::unordered_map<ushort, char*>  ms_ReplacementClothesFileDataMap;
-    std::unordered_map<ushort, uint16> ms_OriginalStreamingSizesMap;
+    std::unordered_map<ushort, char*>         ms_ReplacementClothesFileDataMap;
+    std::unordered_map<ushort, std::uint16_t> ms_OriginalStreamingSizesMap;
 
     bool bClothesReplacementChanged = false;
 
@@ -48,10 +48,10 @@ namespace
         uint            uiArraySize;
     };
 
-    DWORD                        FUNC_CStreamingConvertBufferToObject = 0x40C6B0;
-    CDirectorySAInterface*       g_clothesDirectory = reinterpret_cast<CDirectorySAInterface*>(0xBC12C0);
-    int                          iReturnFileId;
-    char*                        pReturnBuffer;
+    DWORD FUNC_CStreamingConvertBufferToObject = 0x40C6B0;
+    auto  g_clothesDirectory = reinterpret_cast<CDirectorySAInterface*>(0xBC12C0);
+    int   iReturnFileId;
+    char* pReturnBuffer;
 
     size_t GetSizeInBlocks(size_t size)
     {
@@ -102,7 +102,7 @@ void CRenderWareSA::ClothesRemoveReplacement(char* pFileData)
 
             if (it != ms_OriginalStreamingSizesMap.end())
             {
-                uint16 originalStreamingSize = it->second;
+                std::uint16_t originalStreamingSize = it->second;
                 g_clothesDirectory->SetModelStreamingSize(iter->first, originalStreamingSize);
             }