Synchronize changes from 1.6 master branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 3f129e38c833 · 2025-03-13T04:31:19.000Z
61a0e19 Addenum to #4093 (#4095) 69ceac7 Visual Studio Update
diff --git a/Client/game_sa/CBuildingsPoolSA.cpp b/Client/game_sa/CBuildingsPoolSA.cpp
@@ -374,7 +374,8 @@ void CBuildingsPoolSA::RemovePedsContactEnityLinks()
             ped->pLastContactedEntity[3] = nullptr;
             ped->m_ucCollisionState = 0;
 
-            reinterpret_cast<CPlayerPedSA*>(pedLinks->pEntity)->SetTargetedEntity(nullptr);
+            if (auto* playerPed = dynamic_cast<CPlayerPedSA*>(pedLinks->pEntity))
+                playerPed->SetTargetedEntity(nullptr);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,8 @@ void CBuildingsPoolSA::RemovePedsContactEnityLinks()`
`374`	`374`	`ped->pLastContactedEntity[3] = nullptr;`
`375`	`375`	`ped->m_ucCollisionState = 0;`
`376`	`376`
`377`		`- reinterpret_cast<CPlayerPedSA*>(pedLinks->pEntity)->SetTargetedEntity(nullptr);`
	`377`	`+ if (auto* playerPed = dynamic_cast<CPlayerPedSA*>(pedLinks->pEntity))`
	`378`	`+ playerPed->SetTargetedEntity(nullptr);`
`378`	`379`	`}`
`379`	`380`	`}`
`380`	`381`	`}`