Update CDirectorySA

- Removes hungarian notation
- Changes the types of some variables

Author: W3lac3

Client/game_sa/CDirectorySA.cpp

@@ -13,62 +13,59 @@
 
 bool CDirectorySAInterface::AddEntry(DirectoryInfoSA& entry)
 {
-    if (m_nNumEntries >= m_nCapacity)
+    if (m_numEntries >= m_capacity || GetModelEntry(entry.m_name))
         return false;
 
-    if (GetModelEntry(entry.m_szName))
-        return false;
-
-    entry.m_nOffset = 0;
+    entry.m_offset = 0;
 
-    if (m_nNumEntries > 0)
+    if (m_numEntries > 0)
     {
-        DirectoryInfoSA* lastEntry = m_pEntries + m_nNumEntries - 1;
-        entry.m_nOffset = lastEntry->m_nOffset + lastEntry->m_nStreamingSize;
+        DirectoryInfoSA* lastEntry = m_entries + m_numEntries - 1;
+        entry.m_offset = lastEntry->m_offset + lastEntry->m_streamingSize;
 
-        if (entry.m_nOffset % 2048)
-            entry.m_nOffset += 2048 - (entry.m_nOffset % 2048);
+        if (entry.m_offset % 2048)
+            entry.m_offset += 2048 - (entry.m_offset % 2048);
     }
 
-    m_pEntries[m_nNumEntries++] = entry;
+    m_entries[m_numEntries++] = entry;
 
     return true;
 }
 
-bool CDirectorySAInterface::RemoveEntry(const char* pFileName)
+bool CDirectorySAInterface::RemoveEntry(const char* fileName)
 {
-    if (m_nNumEntries <= 0)
+    if (m_numEntries <= 0)
         return false;
 
-    DirectoryInfoSA* entry = GetModelEntry(pFileName);
+    DirectoryInfoSA* entry = GetModelEntry(fileName);
 
     if (!entry)
         return false;
 
-    std::uint32_t index = entry - m_pEntries;
+    std::ptrdiff_t index = entry - m_entries;
 
-    if (index < m_nNumEntries - 1)
+    if (index < m_numEntries - 1)
     {
-        DirectoryInfoSA* lastEntry = m_pEntries + m_nNumEntries - 1;
-        entry->m_nOffset = lastEntry->m_nOffset + lastEntry->m_nSizeInArchive;
+        DirectoryInfoSA* lastEntry = m_entries + m_numEntries - 1;
+        entry->m_offset = lastEntry->m_offset + lastEntry->m_sizeInArchive;
     }
 
-    m_nNumEntries--;
+    m_numEntries--;
 
-    if (index < m_nNumEntries)
-        memmove(entry, entry + 1, (m_nNumEntries - index) * sizeof(DirectoryInfoSA));
+    if (index < m_numEntries)
+        std::memmove(entry, entry + 1, (m_numEntries - index) * sizeof(DirectoryInfoSA));
 
     return true;
 }
 
-DirectoryInfoSA* CDirectorySAInterface::GetModelEntry(const char* pFileName)
+DirectoryInfoSA* CDirectorySAInterface::GetModelEntry(const char* fileName)
 {
-    if (m_nNumEntries <= 0)
+    if (m_numEntries <= 0)
         return nullptr;
 
-    for (DirectoryInfoSA* it = m_pEntries; it != m_pEntries + m_nNumEntries; it++)
+    for (DirectoryInfoSA* it = m_entries; it != m_entries + m_numEntries; it++)
     {
-        if (strcmp(it->m_szName, pFileName) == 0)
+        if (std::strcmp(it->m_name, fileName) == 0)
             return it;
     }
 
@@ -77,10 +74,10 @@ DirectoryInfoSA* CDirectorySAInterface::GetModelEntry(const char* pFileName)
 
 DirectoryInfoSA* CDirectorySAInterface::GetModelEntry(std::uint16_t modelId)
 {
-    if (m_nNumEntries <= 0)
+    if (m_numEntries <= 0)
         return nullptr;
 
-    DirectoryInfoSA* entry = m_pEntries + modelId;
+    DirectoryInfoSA* entry = m_entries + modelId;
 
     if (!entry)
         return nullptr;
@@ -92,13 +89,10 @@ bool CDirectorySAInterface::SetModelStreamingSize(std::uint16_t modelId, std::ui
 {
     DirectoryInfoSA* entry = GetModelEntry(modelId);
 
-    if (!entry)
-        return false;
-
-    if (entry->m_nStreamingSize == size)
+    if (!entry || entry->m_streamingSize == size)
         return false;
 
-    entry->m_nStreamingSize = size;
+    entry->m_streamingSize = size;
     return true;
 }
 
@@ -110,5 +104,5 @@ std::uint16_t CDirectorySAInterface::GetModelStreamingSize(std::uint16_t modelId
     if (!entry)
         return 0;
 
-    return entry->m_nStreamingSize;
+    return entry->m_streamingSize;
 }

Client/game_sa/CDirectorySA.h

@@ -12,26 +12,26 @@
 
 struct DirectoryInfoSA
 {
-    std::uint32_t m_nOffset;
-    std::uint16_t m_nStreamingSize;
-    std::uint16_t m_nSizeInArchive;
-    char          m_szName[24];
+    std::uint32_t m_offset;
+    std::uint16_t m_streamingSize;
+    std::uint16_t m_sizeInArchive;
+    char          m_name[24];
 };
 
 class CDirectorySAInterface
 {
     public:
         bool             AddEntry(DirectoryInfoSA& entry);
-        bool             RemoveEntry(const char* pFileName);
+        bool             RemoveEntry(const char* fileName);
 
-        DirectoryInfoSA* GetModelEntry(const char* pFileName);
+        DirectoryInfoSA* GetModelEntry(const char* fileName);
         DirectoryInfoSA* GetModelEntry(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{};
-        std::uint32_t    m_nCapacity{};
-        std::uint32_t    m_nNumEntries{};
-        bool             m_bOwnsEntries{};
+        DirectoryInfoSA* m_entries{};
+        std::uint32_t    m_capacity{};
+        std::uint32_t    m_numEntries{};
+        bool             m_ownsEntries{};
 };

Client/game_sa/CRenderWareSA.ClothesReplacing.cpp

@@ -145,8 +145,8 @@ bool CRenderWareSA::ClothesAddFile(const char* pFileData, size_t fileSize, const
         return false;
 
     DirectoryInfoSA entry{};
-    entry.m_nStreamingSize = GetSizeInBlocks(fileSize);
-    strncpy(entry.m_szName, pFileName, sizeof(entry.m_szName));
+    entry.m_streamingSize = GetSizeInBlocks(fileSize);
+    strncpy(entry.m_name, pFileName, sizeof(entry.m_name));
 
     if (!g_clothesDirectory->AddEntry(entry))
         return false;