Rewrote CFileReader and some code review improvements

CFileReader is using ifstream to load file into std::vector. No more dynamic memory allocation.
&
replaced std::vector::push_back with std::vector::emplace_back in CElementDeleter::OnClientIFPElementDestroy
& Removed empty destructor from CClientIFP and empty constructor from CIFPAnimations
- Suggested by Necktrox

Used for (auto& pPed : m_setOfPedPointers) for iterating in CClientGame::OnClientIFPUnload.
&
using std::find_if in CElementDeleter::DeleteIFP with a lambda function
- Suggested by sbx320

Removed #pragma once in CClientIFP.h and CIFPAnimations.h
- Suggested by sbx320 and Necktrox

Author: codenulls

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6820,17 +6820,17 @@ void CClientGame::RemovePedPointerFromSet(CClientPed* pPed)
 CClientPed* CClientGame::GetClientPedByClump(const RpClump& Clump)
 {
     std::lock_guard<std::mutex> mutexGuardedLock(m_MutexOfPedPointersSet);
-    for (auto it = m_setOfPedPointers.begin(); it != m_setOfPedPointers.end(); it++)
+    for (auto &pPed : m_setOfPedPointers)
     {
-        CEntity* pEntity = (*it)->GetGameEntity();
+        CEntity* pEntity = pPed->GetGameEntity();
         if (pEntity != nullptr)
         {
             if (pEntity->GetRpClump() != nullptr)
             {
                 const RpClump& entityClump = *pEntity->GetRpClump();
                 if (std::addressof(entityClump) == std::addressof(Clump))
                 {
-                    return *it;
+                    return pPed;
                 }
             }
         }
@@ -6842,26 +6842,26 @@ void CClientGame::OnClientIFPUnload(const std::shared_ptr<CClientIFP>& IFP)
 {
     std::lock_guard<std::mutex> mutexGuardedLock(m_MutexOfPedPointersSet);
     IFP->MarkAsUnloading();
-    for (auto it = m_setOfPedPointers.begin(); it != m_setOfPedPointers.end(); it++)
+    for (auto &pPed : m_setOfPedPointers)
     {
         // Remove IFP animations from replaced animations of peds/players
-        (*it)->RestoreAnimations(IFP);
+        pPed->RestoreAnimations(IFP);
 
         // Make sure that streamed in pulses or changing model does not accidently
         // play our custom animation. We can do that by making the custom animation
         // untriggerable
-        if ((*it)->GetCustomAnimationBlockNameHash() == IFP->GetBlockNameHash())
+        if (pPed->GetCustomAnimationBlockNameHash() == IFP->GetBlockNameHash())
         {
-            if ((*it)->IsCustomAnimationPlaying())
+            if (pPed->IsCustomAnimationPlaying())
             {
-                (*it)->SetCustomAnimationUntriggerable();
+                pPed->SetCustomAnimationUntriggerable();
             }
 
             // Important! As we are using a shared_ptr, we need to decrement the reference counter
             // by setting the shared_ptr to nullptr, this will avoid memory leak
-            if (!(*it)->IsNextAnimationCustom() && (*it)->IsCurrentAnimationCustom())
+            if (!pPed->IsNextAnimationCustom() && pPed->IsCurrentAnimationCustom())
             {
-                (*it)->DereferenceCustomAnimationBlock();
+                pPed->DereferenceCustomAnimationBlock();
             }
         }
     }

Client/mods/deathmatch/logic/CClientIFP.cpp

@@ -13,29 +13,22 @@ CClientIFP::CClientIFP(class CClientManager* pManager, ElementID ID) : CClientEn
     m_u32Hashkey = 0;
 }
 
-CClientIFP::~CClientIFP(void)
-{
-    // g_pCore->GetConsole ()->Printf( "CClientIFP::~CClientIFP called! BlockName: %s", m_strBlockName.c_str ( ) );
-}
-
-bool CClientIFP::LoadIFP(const char* szFilePath, const SString& strBlockName)
+bool CClientIFP::LoadIFP(const SString& strFilePath, const SString& strBlockName)
 {
     m_strBlockName = strBlockName;
     m_pVecAnimations = &m_pIFPAnimations->vecAnimations;
 
-    if (LoadIFPFile(szFilePath))
+    if (LoadIFPFile(strFilePath))
     {
         m_u32Hashkey = HashString(strBlockName.ToLower());
         return true;
     }
     return false;
 }
 
-bool CClientIFP::LoadIFPFile(const char* szFilePath)
+bool CClientIFP::LoadIFPFile(const SString& strFilePath)
 {
-    CreateLoader(szFilePath);
-
-    if (LoadFile())
+    if (LoadFileToMemory(strFilePath))
     {
         char Version[4];
         ReadBytes(Version, sizeof(Version));
@@ -53,9 +46,9 @@ bool CClientIFP::LoadIFPFile(const char* szFilePath)
             ReadIFPVersion1();
         }
 
-        // We are unloading the data because we don't need to read it anymore.
+        // We are freeing the file reader memory because we don't need to read it anymore.
         // This function does not unload IFP, to unload ifp, use destroyElement from Lua
-        UnloadFile();
+        FreeFileReaderMemory();
     }
     else
     {
@@ -279,7 +272,7 @@ void CClientIFP::ReadAnimationNameVersion1(SAnimation& IfpAnimation)
     RoundSize(Name.Base.Size);
 
     char szAnimationName[24];
-    ReadCString(szAnimationName, Name.Base.Size);
+    ReadStringNullTerminated(szAnimationName, Name.Base.Size);
     IfpAnimation.Name = szAnimationName;
     IfpAnimation.u32NameHash = HashString(IfpAnimation.Name.ToLower());
 }
@@ -301,7 +294,7 @@ CClientIFP::eFrameType CClientIFP::ReadKfrm(void)
 
 void CClientIFP::ReadAnimationHeaderVersion2(SAnimationHeaderV2& AnimationNode, bool bAnp3)
 {
-    ReadCString((char*)&AnimationNode.Name, sizeof(SAnimationHeaderV2::Name));
+    ReadStringNullTerminated((char*)&AnimationNode.Name, sizeof(SAnimationHeaderV2::Name));
     ReadBuffer<int32_t>(&AnimationNode.TotalObjects);
     if (bAnp3)
     {
@@ -354,9 +347,7 @@ void CClientIFP::ReadKrtsFramesAsCompressed(std::unique_ptr<CAnimBlendSequence>&
         CompressedKrt0->Rotation.Y = static_cast<int16_t>(((-Krts.Rotation.Y) * 4096.0f));
         CompressedKrt0->Rotation.Z = static_cast<int16_t>(((-Krts.Rotation.Z) * 4096.0f));
         CompressedKrt0->Rotation.W = static_cast<int16_t>((Krts.Rotation.W * 4096.0f));
-
         CompressedKrt0->Time = static_cast<int16_t>((Krts.Time * 60.0f + 0.5f));
-
         CompressedKrt0->Translation.X = static_cast<int16_t>((Krts.Translation.X * 1024.0f));
         CompressedKrt0->Translation.Y = static_cast<int16_t>((Krts.Translation.Y * 1024.0f));
         CompressedKrt0->Translation.Z = static_cast<int16_t>((Krts.Translation.Z * 1024.0f));
@@ -375,9 +366,7 @@ void CClientIFP::ReadKrt0FramesAsCompressed(std::unique_ptr<CAnimBlendSequence>&
         CompressedKrt0->Rotation.Y = static_cast<int16_t>(((-Krt0.Rotation.Y) * 4096.0f));
         CompressedKrt0->Rotation.Z = static_cast<int16_t>(((-Krt0.Rotation.Z) * 4096.0f));
         CompressedKrt0->Rotation.W = static_cast<int16_t>((Krt0.Rotation.W * 4096.0f));
-
         CompressedKrt0->Time = static_cast<int16_t>((Krt0.Time * 60.0f + 0.5f));
-
         CompressedKrt0->Translation.X = static_cast<int16_t>((Krt0.Translation.X * 1024.0f));
         CompressedKrt0->Translation.Y = static_cast<int16_t>((Krt0.Translation.Y * 1024.0f));
         CompressedKrt0->Translation.Z = static_cast<int16_t>((Krt0.Translation.Z * 1024.0f));
@@ -396,7 +385,6 @@ void CClientIFP::ReadKr00FramesAsCompressed(std::unique_ptr<CAnimBlendSequence>&
         CompressedKr00->Rotation.Y = static_cast<int16_t>(((-Kr00.Rotation.Y) * 4096.0f));
         CompressedKr00->Rotation.Z = static_cast<int16_t>(((-Kr00.Rotation.Z) * 4096.0f));
         CompressedKr00->Rotation.W = static_cast<int16_t>((Kr00.Rotation.W * 4096.0f));
-
         CompressedKr00->Time = static_cast<int16_t>((Kr00.Time * 60.0f + 0.5f));
     }
 }

Client/mods/deathmatch/logic/CClientIFP.h

@@ -1,12 +1,9 @@
-#pragma once
-
 #ifndef __CCLIENTIFP_H
 #define __CCLIENTIFP_H
 
 #include "CClientEntity.h"
 #include "CFileReader.h"
 #include "CIFPAnimations.h"
-#include <algorithm>
 
 class CClientIFP : public CClientEntity, CFileReader
 {
@@ -132,14 +129,12 @@ class CClientIFP : public CClientEntity, CFileReader
     struct SIFPHeaderV2
     {
         int32_t OffsetEOF;
-        char    InternalFilSName[24];
+        char    InternalFileName[24];
         int32_t TotalAnimations;
     };
 
     struct SAnimationHeaderV2
     {
-        // 24 + 4 + 4 + 4 = 36 bytes
-
         char    Name[24];
         int32_t TotalObjects;
         int32_t FrameSize;
@@ -192,16 +187,29 @@ class CClientIFP : public CClientEntity, CFileReader
         R_FOOT = 53,
         R_TOE_0 = 54
     };
+
     CClientIFP(class CClientManager* pManager, ElementID ID);
-    ~CClientIFP(void);
 
     virtual eClientEntityType GetType(void) const { return CCLIENTIFP; }
 
     void MarkAsUnloading(void) { m_bUnloading = true; }
     bool IsUnloading(void) { return m_bUnloading; }
 
-    bool LoadIFP(const char* szFilePath, const SString& strBlockName);
-    bool LoadIFPFile(const char* szFilePath);
+    bool LoadIFP(const SString& strFilePath, const SString& strBlockName);
+
+    const SString&      GetBlockName(void) { return m_strBlockName; }
+    const unsigned int& GetBlockNameHash(void) { return m_u32Hashkey; }
+
+    CAnimBlendHierarchySAInterface* GetAnimationHierarchy(const SString& strAnimationName);
+    std::shared_ptr<CIFPAnimations> GetIFPAnimationsPointer(void) { return m_pIFPAnimations; }
+
+    // Sorta a hack that these are required by CClientEntity...
+    void Unlink(void){};
+    void GetPosition(CVector& vecPosition) const {};
+    void SetPosition(const CVector& vecPosition){};
+
+private:
+    bool LoadIFPFile(const SString& strFilePath);
     void ReadIFPVersion1(void);
     void ReadIFPVersion2(bool bAnp3);
 
@@ -251,18 +259,6 @@ class CClientIFP : public CClientEntity, CFileReader
     std::string GetCorrectBoneNameFromName(std::string const& BoneName);
     std::string GetCorrectBoneNameFromID(int32_t& BoneID);
 
-    const SString&      GetBlockName(void) { return m_strBlockName; }
-    const unsigned int& GetBlockNameHash(void) { return m_u32Hashkey; }
-
-    CAnimBlendHierarchySAInterface* GetAnimationHierarchy(const SString& strAnimationName);
-    std::shared_ptr<CIFPAnimations> GetIFPAnimationsPointer(void) { return m_pIFPAnimations; }
-
-    // Sorta a hack that these are required by CClientEntity...
-    void Unlink(void){};
-    void GetPosition(CVector& vecPosition) const {};
-    void SetPosition(const CVector& vecPosition){};
-
-private:
     std::shared_ptr<CIFPAnimations> m_pIFPAnimations;
     SString                         m_strBlockName;
     unsigned int                    m_u32Hashkey;

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -94,6 +94,8 @@ void CClientPed::Init(CClientManager* pManager, unsigned long ulModelID, bool bI
     m_bisCurrentAnimationCustom = false;
     m_strCustomIFPBlockName = "Default";
     m_strCustomIFPAnimationName = "Default";
+    m_u32CustomBlockNameHash = 0;
+    m_u32CustomAnimationNameHash = 0;
     m_iVehicleInOutState = VEHICLE_INOUT_NONE;
     m_pPlayerPed = NULL;
     m_pTaskManager = NULL;

Client/mods/deathmatch/logic/CElementDeleter.cpp

@@ -92,13 +92,15 @@ void CElementDeleter::DeleteIFP(CClientEntity* pElement)
 {
     CClientIFP&        IFP = static_cast<CClientIFP&>(*pElement);
     const unsigned int u32BlockNameHash = IFP.GetBlockNameHash();
-    for (auto it = m_vecIFPElements.begin(); it != m_vecIFPElements.end(); ++it)
+
+    auto it = std::find_if(m_vecIFPElements.begin(), m_vecIFPElements.end(),
+    [&u32BlockNameHash](std::shared_ptr<CClientIFP> const& pIFP)
     {
-        if ((*it)->GetBlockNameHash() == u32BlockNameHash)
-        {
-            m_vecIFPElements.erase(it);
-            break;
-        }
+		return pIFP->GetBlockNameHash() == u32BlockNameHash;
+	});
+    if(it != m_vecIFPElements.end())
+    {
+        m_vecIFPElements.erase(it);
     }
 }
 
@@ -151,7 +153,7 @@ void CElementDeleter::OnClientIFPElementDestroy(CClientEntity* pElement)
 
         // keep a reference to shared_ptr CClientIFP in list, so it does not get
         // destroyed after exiting this function
-        m_vecIFPElements.push_back(pIFP);
+        m_vecIFPElements.emplace_back(pIFP);
     }
 }