summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-19 14:20:50 +0200
committeraap <aap@papnet.eu>2019-06-19 14:20:50 +0200
commitf88f711ddde56f2cb8f1918e4a62106f43d53cd0 (patch)
tree382359b3fa0f37350e732084e4395500e69b5cfe
parentcleanup on CPed and CPedType (diff)
downloadre3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.tar
re3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.tar.gz
re3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.tar.bz2
re3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.tar.lz
re3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.tar.xz
re3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.tar.zst
re3-f88f711ddde56f2cb8f1918e4a62106f43d53cd0.zip
-rw-r--r--src/entities/Ped.cpp10
-rw-r--r--src/entities/Ped.h12
2 files changed, 11 insertions, 11 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp
index 9e986dd0..40d81cc8 100644
--- a/src/entities/Ped.cpp
+++ b/src/entities/Ped.cpp
@@ -223,16 +223,16 @@ CPed::AimGun()
}
CPed::Say(SOUND_PED_ATTACK);
- m_ped_flagB2 = m_pedIK.PointGunAtPosition(&vector);
+ bCanPointGunAtTarget = m_pedIK.PointGunAtPosition(&vector);
if (m_pLookTarget != m_pSeekTarget) {
CPed::SetLookFlag(m_pSeekTarget, 1);
}
} else {
if (CPed::IsPlayer()) {
- m_ped_flagB2 = m_pedIK.PointGunInDirection(m_fLookDirection, ((CPlayerPed*)this)->m_fFPSMoveHeading);
+ bCanPointGunAtTarget = m_pedIK.PointGunInDirection(m_fLookDirection, ((CPlayerPed*)this)->m_fFPSMoveHeading);
} else {
- m_ped_flagB2 = m_pedIK.PointGunInDirection(m_fLookDirection, 0.0f);
+ bCanPointGunAtTarget = m_pedIK.PointGunInDirection(m_fLookDirection, 0.0f);
}
}
}
@@ -338,7 +338,7 @@ CPed::SetLookFlag(CPed *target, bool unknown)
{
if (m_lookTimer < CTimer::GetTimeInMilliseconds()) {
bIsLooking = true;
- m_ped_flagA40 = false;
+ bIsRestoringLook = false;
m_pLookTarget = target;
m_pLookTarget->RegisterReference((CEntity**)&m_pLookTarget);
m_fLookDirection = 999999.0f;
@@ -355,7 +355,7 @@ CPed::SetLookFlag(float direction, bool unknown)
{
if (m_lookTimer < CTimer::GetTimeInMilliseconds()) {
bIsLooking = true;
- m_ped_flagA40 = false;
+ bIsRestoringLook = false;
m_pLookTarget = nil;
m_fLookDirection = direction;
m_lookTimer = 0;
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index 60b88765..ce0d68c5 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -97,12 +97,12 @@ public:
uint8 m_ped_flagA2 : 1;
uint8 m_ped_flagA4 : 1; // stores (CTimer::GetTimeInMilliseconds() < m_lastHitTime)
uint8 m_ped_flagA8 : 1;
- uint8 bIsLooking : 1; // set when A20 just changed?
- uint8 m_ped_flagA20_look : 1;
- uint8 m_ped_flagA40 : 1;
- uint8 m_ped_flagA80 : 1;
- uint8 m_ped_flagB1 : 1;
- uint8 m_ped_flagB2 : 1;
+ uint8 bIsLooking : 1;
+ uint8 m_ped_flagA20_look : 1; // probably missing in SA
+ uint8 bIsRestoringLook : 1;
+ uint8 bIsAimingGun : 1;
+ uint8 bIsRestoringGun : 1;
+ uint8 bCanPointGunAtTarget : 1;
uint8 m_ped_flagB4 : 1;
uint8 m_ped_flagB8 : 1;
uint8 m_ped_flagB10 : 1;