From 99a6976f53a3a6cb31e455d44f7c0c642863b0e4 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 12 Jan 2021 12:42:29 +0100 Subject: [PATCH 1/3] colmodel fix --- src/collision/ColModel.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/collision/ColModel.cpp b/src/collision/ColModel.cpp index d2e01f50..49847dbd 100644 --- a/src/collision/ColModel.cpp +++ b/src/collision/ColModel.cpp @@ -24,7 +24,6 @@ CColModel::CColModel(void) CColModel::~CColModel(void) { RemoveCollisionVolumes(); - RemoveTrianglePlanes(); } void* From 6cfc61ac0e08e7d2f6455ffc8d0194b0a895d323 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Tue, 12 Jan 2021 20:54:52 +0300 Subject: [PATCH 2/3] big oof --- src/control/Script4.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/control/Script4.cpp b/src/control/Script4.cpp index a3ded9a5..efe35efb 100644 --- a/src/control/Script4.cpp +++ b/src/control/Script4.cpp @@ -106,7 +106,10 @@ int8 CRunningScript::ProcessCommands800To899(int32 command) printf("Couldn't find zone - %s\n", zone); return 0; } - CTheZones::SetPedGroup(zone_id, ScriptParams[0], ScriptParams[1]); + while (zone_id >= 0) { + CTheZones::SetPedGroup(zone_id, ScriptParams[0], ScriptParams[1]); + zone_id = CTheZones::FindNextZoneByLabelAndReturnIndex(zone, ZONE_INFO); + } return 0; } case COMMAND_START_CAR_FIRE: From 0afa027ab4a08ea978963f4f83c90b1de86416c4 Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 12 Jan 2021 21:28:13 +0100 Subject: [PATCH 3/3] bug of the decade --- src/core/PlayerInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 77ddfdb1..7289175d 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -132,7 +132,7 @@ CPlayerInfo::Process(void) CAutomobile *car = (CAutomobile*)m_pPed->m_pMyVehicle; if (car->m_nWheelsOnGround < 3) - m_nTimeNotFullyOnGround += CTimer::GetTimeInMilliseconds(); + m_nTimeNotFullyOnGround += CTimer::GetTimeStepInMilliseconds(); else m_nTimeNotFullyOnGround = 0;