Add asserts to identify the source of a ped related crash

Author: botder

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -4279,7 +4279,10 @@ bool CClientGame::DamageHandler(CPed* pDamagePed, CEventDamage* pEvent)
         SClientEntity<CPedSA>* pPedClientEntity = pPools->GetPed((DWORD*)pDamagePed->GetInterface());
         if (pPedClientEntity)
         {
+            assert(pPedClientEntity->pEntity != nullptr);
+            assert(pPedClientEntity->pClientEntity != nullptr);
             pDamagedPed = reinterpret_cast<CClientPed*>(pPedClientEntity->pClientEntity);
+            assert(pDamagedPed->GetGamePlayer() != nullptr);
         }
     }
 

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -3584,7 +3584,10 @@ void CClientPed::_CreateModel()
     m_pLoadedModelInfo->ModelAddRef(BLOCKING, "CClientPed::_CreateModel");
 
     // Create the new ped
-    m_pPlayerPed = dynamic_cast<CPlayerPed*>(g_pGame->GetPools()->AddPed(this, static_cast<ePedModel>(m_ulModel)));
+    CPed* gamePed = g_pGame->GetPools()->AddPed(this, static_cast<ePedModel>(m_ulModel));
+    m_pPlayerPed = dynamic_cast<CPlayerPed*>(gamePed);
+    assert(gamePed == nullptr && m_pPlayerPed == nullptr || gamePed != nullptr && m_pPlayerPed != nullptr);
+
     if (m_pPlayerPed)
     {
         // Put our pointer in the stored data and update the remote data with the new model pointer
@@ -3708,7 +3711,10 @@ void CClientPed::_CreateLocalModel()
 {
     // Init the local player and grab the pointers
     g_pGame->InitLocalPlayer(this);
-    m_pPlayerPed = dynamic_cast<CPlayerPed*>(g_pGame->GetPools()->GetPedFromRef((DWORD)1));
+
+    CPed* gamePed = g_pGame->GetPools()->GetPedFromRef((DWORD)1);
+    m_pPlayerPed = dynamic_cast<CPlayerPed*>(gamePed);
+    assert(gamePed == nullptr && m_pPlayerPed == nullptr || gamePed != nullptr && m_pPlayerPed != nullptr);
 
     if (m_pPlayerPed)
     {
@@ -3806,10 +3812,17 @@ void CClientPed::_DestroyModel()
     // Invalidate
     m_pManager->InvalidateEntity(this);
 
+    // Store the amount of peds in the ped pool before removal
+    unsigned long const previousPedCount = g_pGame->GetPools()->GetPedCount();
+
     // Remove the ped from the world
     g_pGame->GetPools()->RemovePed(m_pPlayerPed);
-    m_pPlayerPed = NULL;
-    m_pTaskManager = NULL;
+    m_pPlayerPed = nullptr;
+    m_pTaskManager = nullptr;
+
+    // Verify that our ped got actually removed from the ped pool
+    unsigned long const currentPedCount = g_pGame->GetPools()->GetPedCount();
+    assert(currentPedCount < previousPedCount);
 
     // Remove the reference to its model
     m_pLoadedModelInfo->RemoveRef();