diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-22 01:42:04 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-22 01:42:04 +0200 |
| commit | 864847a6fe5461581232a68b64d98dd15d035330 (patch) | |
| tree | 0d57b42ff992fa7afe651f6e74da950168aa030a /src/core | |
| parent | script revision (diff) | |
| download | re3-864847a6fe5461581232a68b64d98dd15d035330.tar re3-864847a6fe5461581232a68b64d98dd15d035330.tar.gz re3-864847a6fe5461581232a68b64d98dd15d035330.tar.bz2 re3-864847a6fe5461581232a68b64d98dd15d035330.tar.lz re3-864847a6fe5461581232a68b64d98dd15d035330.tar.xz re3-864847a6fe5461581232a68b64d98dd15d035330.tar.zst re3-864847a6fe5461581232a68b64d98dd15d035330.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ColStore.cpp | 2 | ||||
| -rw-r--r-- | src/core/PlayerInfo.cpp | 5 | ||||
| -rw-r--r-- | src/core/PlayerInfo.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/core/ColStore.cpp b/src/core/ColStore.cpp index 80bbdc77..070967e5 100644 --- a/src/core/ColStore.cpp +++ b/src/core/ColStore.cpp @@ -178,7 +178,7 @@ CColStore::LoadCollision(const CVector2D &pos) }else{ for (int j = 0; j < MAX_CLEANUP; j++) { CPhysical* pEntity = CTheScripts::MissionCleanup.DoesThisEntityWaitForCollision(j); - if (pEntity /* !pEntity->bDontLoadCollision && !pEntity->bIsFrozen */) { + if (pEntity && !pEntity->bDontLoadCollision && !pEntity->bIsFrozen) { if (GetBoundingBox(i).IsPointInside(pEntity->GetPosition(), -80.0f)) wantThisOne = true; } diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index 37a62adf..675fafb3 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -149,13 +149,14 @@ CPlayerInfo::Clear(void) } void -CPlayerInfo::BlowUpRCBuggy(void) +CPlayerInfo::BlowUpRCBuggy(bool actually) { if (!m_pRemoteVehicle || m_pRemoteVehicle->bRemoveFromWorld) return; CRemote::TakeRemoteControlledCarFromPlayer(); - m_pRemoteVehicle->BlowUpCar(FindPlayerPed()); + if (actually) + m_pRemoteVehicle->BlowUpCar(FindPlayerPed()); } void diff --git a/src/core/PlayerInfo.h b/src/core/PlayerInfo.h index ea9d563a..119f0b2c 100644 --- a/src/core/PlayerInfo.h +++ b/src/core/PlayerInfo.h @@ -50,6 +50,7 @@ public: int32 m_nExplosionsSinceLastReward; int32 field_268; int32 field_272; + uint32 m_nHavocLevel; bool m_bInfiniteSprint; bool m_bFastReload; bool m_bFireproof; @@ -73,7 +74,7 @@ public: bool IsPlayerInRemoteMode(void); void PlayerFailedCriticalMission(void); void Clear(void); - void BlowUpRCBuggy(void); + void BlowUpRCBuggy(bool); void CancelPlayerEnteringCars(CVehicle*); bool IsRestartingAfterDeath(void); bool IsRestartingAfterArrest(void); |