From 3e549a7d4484340d8d71500a7e61f81f403f48cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sat, 29 Aug 2020 19:22:25 +0300
Subject: CGame done, Peds, fixes

---
 src/control/Script.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/control/Script.cpp')

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index bf761a3f..0921d1c6 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1698,11 +1698,11 @@ void CMissionCleanup::AddEntityToList(int32 id, uint8 type)
 	m_nCount++;
 }
 
-static void PossiblyWakeThisEntity(CPhysical* pEntity)
+static void PossiblyWakeThisEntity(CPhysical* pEntity, bool ifColLoaded = false)
 {
 	if (!pEntity->bIsStaticWaitingForCollision)
 		return;
-	if (CColStore::HasCollisionLoaded(pEntity->GetPosition())) {
+	if (!ifColLoaded || CColStore::HasCollisionLoaded(pEntity->GetPosition())) {
 		pEntity->bIsStaticWaitingForCollision = false;
 		if (!pEntity->IsStatic())
 			pEntity->AddToMovingList();
@@ -1745,7 +1745,7 @@ void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
 	}
 }
 
-void CMissionCleanup::CheckIfCollisionHasLoadedForMissionObject()
+void CMissionCleanup::CheckIfCollisionHasLoadedForMissionObjects()
 {
 	for (int i = 0; i < MAX_CLEANUP; i++) {
 		switch (m_sEntities[i].type) {
@@ -1753,21 +1753,21 @@ void CMissionCleanup::CheckIfCollisionHasLoadedForMissionObject()
 		{
 			CVehicle* v = CPools::GetVehiclePool()->GetAt(m_sEntities[i].id);
 			if (v)
-				PossiblyWakeThisEntity(v);
+				PossiblyWakeThisEntity(v, true);
 			break;
 		}
 		case CLEANUP_CHAR:
 		{
 			CPed* p = CPools::GetPedPool()->GetAt(m_sEntities[i].id);
 			if (p)
-				PossiblyWakeThisEntity(p);
+				PossiblyWakeThisEntity(p, true);
 			break;
 		}
 		case CLEANUP_OBJECT:
 		{
 			CObject* o = CPools::GetObjectPool()->GetAt(m_sEntities[i].id);
 			if (o)
-				PossiblyWakeThisEntity(o);
+				PossiblyWakeThisEntity(o, true);
 			break;
 		}
 		default:
@@ -2350,7 +2350,7 @@ void CTheScripts::Process()
 	float timeStep = CTimer::GetTimeStepInMilliseconds();
 	UpsideDownCars.UpdateTimers();
 	StuckCars.Process();
-	MissionCleanup.CheckIfCollisionHasLoadedForMissionObject();
+	MissionCleanup.CheckIfCollisionHasLoadedForMissionObjects();
 	DrawScriptSpheres();
 	if (FailCurrentMission)
 		--FailCurrentMission;
-- 
cgit v1.2.3