Optimization Handling (part 3) and Remove big use eVehicleTypes

Client/game_sa/CCamSA.cpp

@@ -20,8 +20,8 @@ CEntity* CCamSA::GetTargetEntity() const
     CEntitySAInterface* pInterface = m_pInterface->CamTargetEntity;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
-        return pPools->GetEntity((DWORD*)pInterface);
+        auto pools = pGame->GetPools();
+        return pools->GetEntity((DWORD*)pInterface);
     }
     return nullptr;
 }

Client/game_sa/CCameraSA.cpp

@@ -366,8 +366,7 @@ CEntity* CCameraSA::GetTargetEntity()
     CEntitySAInterface* pInterface = GetInterface()->pTargetEntity;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
-        return pPools->GetEntity((DWORD*)pInterface);
+        return pGame->GetPools()->GetEntity((DWORD*)pInterface);
     }
     return nullptr;
 }

Client/game_sa/CEventDamageSA.cpp

@@ -72,8 +72,7 @@ CEntity* CEventDamageSA::GetInflictingEntity()
     CEntitySAInterface* pInterface = m_pInterface->pInflictor;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
-        return pPools->GetEntity((DWORD*)pInterface);
+        return pGame->GetPools()->GetEntity((DWORD*)pInterface);
     }
     return pReturn;
 }

Client/game_sa/CExplosionSA.cpp

@@ -39,7 +39,7 @@ CEntity* CExplosionSA::GetExplosionCreator()
 {
     eEntityType entityType = (eEntityType)GetInterface()->m_pEntExplosionOwner->nType;
 
-    CPools* pools = pGame->GetPools();
+    auto pools = pGame->GetPools();
     switch (entityType)
     {
         case ENTITY_TYPE_PED:

Client/game_sa/CFireSA.cpp

@@ -70,14 +70,14 @@ CEntity* CFireSA::GetCreator()
 {
     CEntity*            creatorEntity = NULL;
     CEntitySAInterface* createEntitySA = internalInterface->entityCreator;
-    CPoolsSA*           pPools = ((CPoolsSA*)pGame->GetPools());
-    if (pPools && createEntitySA)
+    auto                pools = std::static_pointer_cast<CPoolsSA>(pGame->GetPools());
+    if (pools && createEntitySA)
     {
         switch (createEntitySA->nType)
         {
             case ENTITY_TYPE_PED:
             {
-                SClientEntity<CPedSA>* pPedClientEntity = pPools->GetPed((DWORD*)createEntitySA);
+                SClientEntity<CPedSA>* pPedClientEntity = pools->GetPed((DWORD*)createEntitySA);
                 if (pPedClientEntity)
                 {
                     creatorEntity = pPedClientEntity->pEntity;
@@ -86,7 +86,7 @@ CEntity* CFireSA::GetCreator()
             }
             case ENTITY_TYPE_VEHICLE:
             {
-                SClientEntity<CVehicleSA>* pVehicleClientEntity = pPools->GetVehicle((DWORD*)createEntitySA);
+                SClientEntity<CVehicleSA>* pVehicleClientEntity = pools->GetVehicle((DWORD*)createEntitySA);
                 if (pVehicleClientEntity)
                 {
                     creatorEntity = pVehicleClientEntity->pEntity;
@@ -106,14 +106,14 @@ CEntity* CFireSA::GetEntityOnFire()
 {
     CEntity*            TargetEntity = NULL;
     CEntitySAInterface* TargetEntitySA = internalInterface->entityTarget;
-    CPoolsSA*           pPools = ((CPoolsSA*)pGame->GetPools());
-    if (pPools && TargetEntitySA)
+    auto                pools = std::static_pointer_cast<CPoolsSA>(pGame->GetPools());
+    if (pools && TargetEntitySA)
     {
         switch (TargetEntitySA->nType)
         {
             case ENTITY_TYPE_PED:
             {
-                SClientEntity<CPedSA>* pPedClientEntity = pPools->GetPed((DWORD*)TargetEntitySA);
+                SClientEntity<CPedSA>* pPedClientEntity = pools->GetPed((DWORD*)TargetEntitySA);
                 if (pPedClientEntity)
                 {
                     TargetEntity = pPedClientEntity->pEntity;
@@ -122,7 +122,7 @@ CEntity* CFireSA::GetEntityOnFire()
             }
             case ENTITY_TYPE_VEHICLE:
             {
-                SClientEntity<CVehicleSA>* pVehicleClientEntity = pPools->GetVehicle((DWORD*)TargetEntitySA);
+                SClientEntity<CVehicleSA>* pVehicleClientEntity = pools->GetVehicle((DWORD*)TargetEntitySA);
                 if (pVehicleClientEntity)
                 {
                     TargetEntity = pVehicleClientEntity->pEntity;

Client/game_sa/CGameSA.cpp

@@ -104,7 +104,7 @@ CGameSA::CGameSA()
     m_pAESoundManager = new CAESoundManagerSA((CAESoundManagerSAInterface*)CLASS_CAESoundManager);
     m_pAudioContainer = new CAudioContainerSA();
     m_pWorld = new CWorldSA();
-    m_pPools = new CPoolsSA();
+    m_Pools = std::make_shared<CPoolsSA>();
     m_pClock = new CClockSA();
     m_pRadar = new CRadarSA();
     m_pCamera = new CCameraSA((CCameraSAInterface*)CLASS_CCamera);
@@ -208,17 +208,17 @@ CGameSA::CGameSA()
     m_Cheats[CHEAT_HEALTARMORMONEY] = new SCheatSA((BYTE*)VAR_HealthArmorMoney, false);
 
     // Change pool sizes here
-    m_pPools->SetPoolCapacity(TASK_POOL, 5000);                                               // Default is 500
-    m_pPools->SetPoolCapacity(OBJECT_POOL, MAX_OBJECTS);                                      // Default is 350
-    m_pPools->SetPoolCapacity(EVENT_POOL, 5000);                                              // Default is 200
-    m_pPools->SetPoolCapacity(COL_MODEL_POOL, 12000);                                         // Default is 10150
-    m_pPools->SetPoolCapacity(ENV_MAP_MATERIAL_POOL, 16000);                                  // Default is 4096
-    m_pPools->SetPoolCapacity(ENV_MAP_ATOMIC_POOL, 4000);                                     // Default is 1024
-    m_pPools->SetPoolCapacity(SPEC_MAP_MATERIAL_POOL, 16000);                                 // Default is 4096
-    m_pPools->SetPoolCapacity(ENTRY_INFO_NODE_POOL, MAX_ENTRY_INFO_NODES);                    // Default is 500
-    m_pPools->SetPoolCapacity(POINTER_SINGLE_LINK_POOL, MAX_POINTER_SINGLE_LINKS);            // Default is 70000
-    m_pPools->SetPoolCapacity(POINTER_DOUBLE_LINK_POOL, MAX_POINTER_DOUBLE_LINKS);            // Default is 3200
-    dassert(m_pPools->GetPoolCapacity(POINTER_SINGLE_LINK_POOL) == MAX_POINTER_SINGLE_LINKS);
+    m_Pools->SetPoolCapacity(TASK_POOL, 5000);                                               // Default is 500
+    m_Pools->SetPoolCapacity(OBJECT_POOL, MAX_OBJECTS);                                      // Default is 350
+    m_Pools->SetPoolCapacity(EVENT_POOL, 5000);                                              // Default is 200
+    m_Pools->SetPoolCapacity(COL_MODEL_POOL, 12000);                                         // Default is 10150
+    m_Pools->SetPoolCapacity(ENV_MAP_MATERIAL_POOL, 16000);                                  // Default is 4096
+    m_Pools->SetPoolCapacity(ENV_MAP_ATOMIC_POOL, 4000);                                     // Default is 1024
+    m_Pools->SetPoolCapacity(SPEC_MAP_MATERIAL_POOL, 16000);                                 // Default is 4096
+    m_Pools->SetPoolCapacity(ENTRY_INFO_NODE_POOL, MAX_ENTRY_INFO_NODES);                    // Default is 500
+    m_Pools->SetPoolCapacity(POINTER_SINGLE_LINK_POOL, MAX_POINTER_SINGLE_LINKS);            // Default is 70000
+    m_Pools->SetPoolCapacity(POINTER_DOUBLE_LINK_POOL, MAX_POINTER_DOUBLE_LINKS);            // Default is 3200
+    dassert(m_Pools->GetPoolCapacity(POINTER_SINGLE_LINK_POOL) == MAX_POINTER_SINGLE_LINKS);
 
     // Increase streaming object instances list size
     MemPut<WORD>(0x05B8E55, MAX_RWOBJECT_INSTANCES * 12);            // Default is 1000 * 12
@@ -275,7 +275,6 @@ CGameSA::~CGameSA()
     delete reinterpret_cast<CCameraSA*>(m_pCamera);
     delete reinterpret_cast<CRadarSA*>(m_pRadar);
     delete reinterpret_cast<CClockSA*>(m_pClock);
-    delete reinterpret_cast<CPoolsSA*>(m_pPools);
     delete reinterpret_cast<CWorldSA*>(m_pWorld);
     delete reinterpret_cast<CAudioEngineSA*>(m_pAudioEngine);
     delete reinterpret_cast<CAEAudioHardwareSA*>(m_pAEAudioHardware);
@@ -369,11 +368,11 @@ eSystemState CGameSA::GetSystemState()
  */
 bool CGameSA::InitLocalPlayer(CClientPed* pClientPed)
 {
-    CPoolsSA* pools = (CPoolsSA*)GetPools();
+    auto pools = std::static_pointer_cast<CPoolsSA>(GetPools());
     if (pools)
     {
         //* HACKED IN HERE FOR NOW *//
-        CPedSAInterface* pInterface = pools->GetPedInterface((DWORD)1);
+        CPedSAInterface* pInterface = pools->GetPedInterface(1UL);
 
         if (pInterface)
         {
@@ -1010,8 +1009,8 @@ void CGameSA::RemoveAllBuildings()
 {
     m_pIplStore->SetDynamicIplStreamingEnabled(false);
 
-    m_pPools->GetDummyPool().RemoveAllBuildingLods();
-    m_pPools->GetBuildingsPool().RemoveAllBuildings();
+    m_Pools->GetDummyPool().RemoveAllBuildingLods();
+    m_Pools->GetBuildingsPool().RemoveAllBuildings();
 
     auto pBuildingRemoval = static_cast<CBuildingRemovalSA*>(m_pBuildingRemoval);
     pBuildingRemoval->DropCaches();
@@ -1021,8 +1020,8 @@ void CGameSA::RemoveAllBuildings()
 
 void CGameSA::RestoreGameBuildings()
 {
-    m_pPools->GetBuildingsPool().RestoreAllBuildings();
-    m_pPools->GetDummyPool().RestoreAllBuildingsLods();
+    m_Pools->GetBuildingsPool().RestoreAllBuildings();
+    m_Pools->GetDummyPool().RestoreAllBuildingsLods();
 
     m_pIplStore->SetDynamicIplStreamingEnabled(true, [](CIplSAInterface* ipl) { return memcmp("barriers", ipl->name, 8) != 0; });
     m_isBuildingsRemoved = false;
@@ -1040,7 +1039,7 @@ bool CGameSA::SetBuildingPoolSize(size_t size)
         static_cast<CBuildingRemovalSA*>(m_pBuildingRemoval)->DropCaches();
     }
 
-    bool status = m_pPools->GetBuildingsPool().Resize(size);
+    bool status = m_Pools->GetBuildingsPool().Resize(size);
 
     if (shouldRemoveBuilding)
     {
@@ -1096,7 +1095,7 @@ void CGameSA::OnPedContextChange(CPed* pPedContext)
 CPed* CGameSA::GetPedContext()
 {
     if (!m_pPedContext)
-        m_pPedContext = pGame->GetPools()->GetPedFromRef((DWORD)1);
+        m_pPedContext = pGame->GetPools()->GetPedFromRef(1UL);
     return m_pPedContext;
 }
 

Client/game_sa/CGameSA.h

@@ -125,7 +125,7 @@ class CGameSA : public CGame
     CGameSA();
     ~CGameSA();
 
-    CPools*                   GetPools() { return m_pPools; }
+    std::shared_ptr<CPools>   GetPools() const noexcept { return m_Pools; }
     CPlayerInfo*              GetPlayerInfo() { return m_pPlayerInfo; }
     CProjectileInfo*          GetProjectileInfo() { return m_pProjectileInfo; }
     CRadar*                   GetRadar() { return m_pRadar; }
@@ -311,7 +311,7 @@ class CGameSA : public CGame
     bool SetBuildingPoolSize(size_t size);
 
 private:
-    CPools*                         m_pPools;
+    std::shared_ptr<CPools>         m_Pools;
     CPlayerInfo*                    m_pPlayerInfo;
     CProjectileInfo*                m_pProjectileInfo;
     CRadar*                         m_pRadar;

Client/game_sa/CObjectSA.cpp

@@ -161,7 +161,7 @@ CObjectSA::~CObjectSA()
         }
 
         BeingDeleted = true;
-        ((CPoolsSA*)pGame->GetPools())->RemoveObject((CObject*)(CObjectSA*)this);
+        pGame->GetPools()->RemoveObject((CObject*)(CObjectSA*)this);
     }
 }
 

Client/game_sa/CPedSA.cpp

@@ -718,12 +718,12 @@ CEntity* CPedSA::GetContactEntity()
     CEntitySAInterface* pInterface = ((CPedSAInterface*)GetInterface())->pContactEntity;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
+        auto pools = pGame->GetPools();
         switch (pInterface->nType)
         {
             case ENTITY_TYPE_VEHICLE:
             {
-                SClientEntity<CVehicleSA>* pVehicleClientEntity = pPools->GetVehicle((DWORD*)pInterface);
+                SClientEntity<CVehicleSA>* pVehicleClientEntity = pools->GetVehicle((DWORD*)pInterface);
                 if (pVehicleClientEntity)
                 {
                     return pVehicleClientEntity->pEntity;
@@ -732,7 +732,7 @@ CEntity* CPedSA::GetContactEntity()
             }
             case ENTITY_TYPE_OBJECT:
             {
-                SClientEntity<CObjectSA>* pObjectClientEntity = pPools->GetObject((DWORD*)pInterface);
+                SClientEntity<CObjectSA>* pObjectClientEntity = pools->GetObject((DWORD*)pInterface);
                 if (pObjectClientEntity)
                 {
                     return pObjectClientEntity->pEntity;
@@ -758,8 +758,7 @@ CEntity* CPedSA::GetTargetedEntity()
     CEntitySAInterface* pInterface = ((CPedSAInterface*)GetInterface())->pTargetedEntity;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
-        return pPools->GetEntity((DWORD*)pInterface);
+        return pGame->GetPools()->GetEntity((DWORD*)pInterface);
     }
     return nullptr;
 }

Client/game_sa/CPhysicalSA.cpp

@@ -237,8 +237,7 @@ CEntity* CPhysicalSA::GetDamageEntity()
     CEntitySAInterface* pInterface = ((CPhysicalSAInterface*)GetInterface())->m_pCollidedEntity;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
-        return pPools->GetEntity((DWORD*)pInterface);
+        return pGame->GetPools()->GetEntity((DWORD*)pInterface);
     }
     return nullptr;
 }
@@ -261,8 +260,7 @@ CEntity* CPhysicalSA::GetAttachedEntity()
     CEntitySAInterface* pInterface = ((CPhysicalSAInterface*)GetInterface())->m_pAttachedEntity;
     if (pInterface)
     {
-        CPools* pPools = pGame->GetPools();
-        return pPools->GetEntity((DWORD*)pInterface);
+        return pGame->GetPools()->GetEntity((DWORD*)pInterface);
     }
     return nullptr;
 }

Client/game_sa/CPlayerPedSA.cpp

@@ -52,7 +52,7 @@ CPlayerPedSA::CPlayerPedSA(unsigned int nModelIndex)
     SetInterface((CEntitySAInterface*)dwPedPointer);
 
     Init();            // init our interfaces
-    CPoolsSA* pools = (CPoolsSA*)pGame->GetPools();
+    auto      pools = pGame->GetPools();
     CWorldSA* world = (CWorldSA*)pGame->GetWorld();
 
     SetModelIndex(nModelIndex);
@@ -65,7 +65,7 @@ CPlayerPedSA::CPlayerPedSA(unsigned int nModelIndex)
     m_pData = new CPlayerPedDataSAInterface;
 
     // Copy the local player data so we're defaulted to something good
-    CPlayerPedSA* pLocalPlayerSA = dynamic_cast<CPlayerPedSA*>(pools->GetPedFromRef((DWORD)1));
+    CPlayerPedSA* pLocalPlayerSA = dynamic_cast<CPlayerPedSA*>(pools->GetPedFromRef(1UL));
     if (pLocalPlayerSA)
         MemCpyFast(m_pData, ((CPlayerPedSAInterface*)pLocalPlayerSA->GetInterface())->pPlayerData, sizeof(CPlayerPedDataSAInterface));
 
@@ -104,7 +104,6 @@ CPlayerPedSA::CPlayerPedSA(CPlayerPedSAInterface* pPlayer)
     SetInterface((CEntitySAInterface*)pPlayer);
 
     Init();
-    CPoolsSA* pools = (CPoolsSA*)pGame->GetPools();
     SetType(PLAYER_PED);
     BeingDeleted = false;
 
@@ -149,7 +148,7 @@ CPlayerPedSA::~CPlayerPedSA()
             }
         }
         BeingDeleted = true;
-        ((CPoolsSA*)pGame->GetPools())->RemovePed((CPed*)(CPedSA*)this, false);
+        pGame->GetPools()->RemovePed((CPed*)(CPedSA*)this, false);
     }
 
     // Delete the player data

Client/game_sa/CTasksSA.cpp

@@ -262,7 +262,7 @@ __declspec(noinline) void _cdecl OnCEventHandler_ComputeDamageResponse_Mid(CPedS
                                                                            ePedPieceTypes hitBodyPart, int hitBodySide, int weaponId)
 {
     // Make sure victim is local player
-    CPedSAInterface* pLocalPlayer = ((CPoolsSA*)pGame->GetPools())->GetPedInterface((DWORD)1);
+    CPedSAInterface* pLocalPlayer = std::static_pointer_cast<CPoolsSA>(pGame->GetPools())->GetPedInterface(1UL);
     if (pPedVictim != pLocalPlayer)
         return;
 

Client/game_sa/CVehicleSA.cpp

@@ -236,7 +236,7 @@ CVehicleSA::~CVehicleSA()
             }
         }
         BeingDeleted = true;
-        ((CPoolsSA*)pGame->GetPools())->RemoveVehicle((CVehicle*)this);
+        pGame->GetPools()->RemoveVehicle((CVehicle*)this);
     }
 }
 
@@ -830,12 +830,11 @@ void CVehicleSA::SetEngineOn(bool bEngineOn)
 
 CPed* CVehicleSA::GetDriver()
 {
-    CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
-
+    auto             pools = pGame->GetPools();
     CPedSAInterface* pDriver = GetVehicleInterface()->pDriver;
-    if (pDriver)
+    if (pools && pDriver)
     {
-        SClientEntity<CPedSA>* pPedClientEntity = pPools->GetPed((DWORD*)pDriver);
+        SClientEntity<CPedSA>* pPedClientEntity = pools->GetPed((DWORD*)pDriver);
         if (pPedClientEntity)
         {
             return pPedClientEntity->pEntity;
@@ -846,14 +845,13 @@ CPed* CVehicleSA::GetDriver()
 
 CPed* CVehicleSA::GetPassenger(unsigned char ucSlot)
 {
-    CPoolsSA* pPools = (CPoolsSA*)pGame->GetPools();
-
-    if (ucSlot < 8)
+    auto pools = pGame->GetPools();
+    if (pools && ucSlot < 8)
     {
         CPedSAInterface* pPassenger = GetVehicleInterface()->pPassengers[ucSlot];
         if (pPassenger)
         {
-            SClientEntity<CPedSA>* pPedClientEntity = pPools->GetPed((DWORD*)pPassenger);
+            SClientEntity<CPedSA>* pPedClientEntity = pools->GetPed((DWORD*)pPassenger);
             if (pPedClientEntity)
             {
                 return pPedClientEntity->pEntity;
@@ -1247,8 +1245,7 @@ CPhysical* CVehicleSA::QueryPickedUpEntityWithWinch()
 
     if (phys)
     {
-        CPools* pPools = pGame->GetPools();
-        return reinterpret_cast<CPhysical*>(pPools->GetEntity((DWORD*)phys));
+        return reinterpret_cast<CPhysical*>(pGame->GetPools()->GetEntity((DWORD*)phys));
     }
     return nullptr;
 }

Client/game_sa/CWorldSA.cpp

@@ -452,8 +452,8 @@ bool CWorldSA::ProcessLineOfSight(const CVector* vecStart, const CVector* vecEnd
     // Building info needed?
     if (pBuildingResult)
     {
-        CPoolsSA* pPools = ((CPoolsSA*)pGame->GetPools());
-        if (pPools)
+        auto pools = pGame->GetPools();
+        if (pools)
         {
             if (targetEntity && targetEntity->nType == ENTITY_TYPE_BUILDING)
             {
@@ -498,12 +498,12 @@ bool CWorldSA::ProcessLineOfSight(const CVector* vecStart, const CVector* vecEnd
 
     if (CollisionEntity)
     {
-        CPools* pPools = pGame->GetPools();
-        if (pPools)
+        auto pools = pGame->GetPools();
+        if (pools)
         {
             if (targetEntity)
             {
-                *CollisionEntity = pPools->GetEntity((DWORD*)targetEntity);
+                *CollisionEntity = pools->GetEntity((DWORD*)targetEntity);
             }
         }
     }