Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
some CPed flags named from SA
- Loading branch information
Showing
with
11 additions
and
11 deletions.
-
+5
−5
src/entities/Ped.cpp
-
+6
−6
src/entities/Ped.h
There are no files selected for viewing
|
|
@@ -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; |
|
|
|
|
|
@@ -97,12 +97,12 @@ class CPed : public CPhysical |
|
|
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; |
|
|
|