From 980dd1b5a17440e9a272b7b47ad3553cd1ce11ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Sun, 16 Aug 2020 17:10:59 +0300 Subject: 2 new opcodes --- src/peds/Ped.cpp | 10 +++++----- src/peds/Ped.h | 2 +- src/peds/PlayerPed.cpp | 2 +- src/peds/PlayerPed.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/peds') diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 303c0cbc..c675b7e5 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -439,7 +439,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) bCrouchWhenScared = false; bKnockedOffBike = false; b158_8 = false; - b158_10 = false; + bCollectBusFare = false; bBoughtIceCream = false; b158_40 = false; @@ -12986,10 +12986,10 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg) ped->b157_40 = false; ped->bRemoveFromWorld = true; } - if (ped->b158_10) { - ped->b158_10 = false; + if (ped->bCollectBusFare) { + ped->bCollectBusFare = false; if (FindPlayerPed()) - FindPlayerPed()->m_nPadUpPressedInMilliseconds += 5; + FindPlayerPed()->m_nLastBusFareCollected += 5; } if (!ped->IsNotInWreckedVehicle() || ped->DyingOrDead()) @@ -15176,7 +15176,7 @@ CPed::ProcessObjective(void) b157_40 = true; CPlayerPed *player = FindPlayerPed(); if (pBus->IsPassenger(player) || pBus->IsDriver(player)) { - b158_10 = true; + bCollectBusFare = true; } } } diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 6b0cc5fb..b7d0a856 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -485,7 +485,7 @@ public: uint32 bCrouchWhenScared : 1; uint32 bKnockedOffBike : 1; uint32 b158_8 : 1; - uint32 b158_10 : 1; + uint32 bCollectBusFare : 1; uint32 bBoughtIceCream : 1; uint32 b158_40 : 1; //uint32 b158_80 diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index cba01e31..041fb5e8 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -83,7 +83,7 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1) m_pMeleeList[i] = nil; } m_nCheckPlayersIndex = 0; - m_nPadUpPressedInMilliseconds = 0; + m_nLastBusFareCollected = 0; idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles"); } diff --git a/src/peds/PlayerPed.h b/src/peds/PlayerPed.h index 3b8d8fcb..8a6e7576 100644 --- a/src/peds/PlayerPed.h +++ b/src/peds/PlayerPed.h @@ -43,7 +43,7 @@ public: float m_fGunSpinSpeed; // for minigun float m_fGunSpinAngle; unsigned int m_nPadDownPressedInMilliseconds; - unsigned int m_nPadUpPressedInMilliseconds; + unsigned int m_nLastBusFareCollected; CPlayerPed(); ~CPlayerPed(); -- cgit v1.2.3