diff options
Diffstat (limited to 'src/peds/Ped.h')
| -rw-r--r-- | src/peds/Ped.h | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index dcbe247a..db19619b 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -22,23 +22,6 @@ struct CPedAudioData int m_nMaxRandomDelayTime; }; -// For hit sounds in fight -enum { - S33 = SOUND_FIGHT_PUNCH_33, - S34 = SOUND_FIGHT_KICK_34, - S35 = SOUND_FIGHT_HEADBUTT_35, - S36 = SOUND_FIGHT_PUNCH_36, - S37 = SOUND_FIGHT_PUNCH_37, - S38 = SOUND_FIGHT_CLOSE_PUNCH_38, - S39 = SOUND_FIGHT_PUNCH_39, - S40 = SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40 , - S41 = SOUND_FIGHT_PUNCH_41, - S42 = SOUND_FIGHT_PUNCH_FROM_BEHIND_42, - S43 = SOUND_FIGHT_KNEE_OR_KICK_43, - S44 = SOUND_FIGHT_KICK_44, - NO_SND = SOUND_TOTAL_PED_SOUNDS -}; - struct FightMove { AnimationId animId; @@ -305,10 +288,10 @@ public: uint8 m_ped_flagF2 : 1; uint8 m_ped_flagF4 : 1; uint8 m_ped_flagF8 : 1; - uint8 m_ped_flagF10 : 1; // set before "quickjack" + uint8 bWillBeQuickJacked : 1; uint8 m_ped_flagF20 : 1; uint8 m_ped_flagF40 : 1; - uint8 m_ped_flagF80 : 1; + uint8 bDuckAndCover : 1; uint8 m_ped_flagG1 : 1; uint8 m_ped_flagG2 : 1; @@ -394,7 +377,7 @@ public: float m_fRotationCur; float m_fRotationDest; float m_headingRate; - uint16 m_vehEnterType; + uint16 m_vehEnterType; // TODO: this is more like a door, not a type uint16 m_walkAroundType; CEntity *m_pCurrentPhysSurface; CVector m_vecOffsetFromPhysSurface; @@ -450,7 +433,7 @@ public: uint32 m_hitRecoverTimer; uint32 m_objectiveTimer; uint32 m_duckTimer; - uint32 field_4E8; + uint32 m_duckAndCoverTimer; int32 m_bloodyFootprintCount; uint8 m_panicCounter; uint8 m_deadBleeding; @@ -538,9 +521,9 @@ public: void RegisterThreatWithGangPeds(CEntity*); bool TurnBody(void); void Chat(void); - void MakeChangesForNewWeapon(int8); void CheckAroundForPossibleCollisions(void); void SetSeek(CVector, float); + void SetSeek(CEntity*, float); bool MakePhonecall(void); bool FacePhone(void); CPed *CheckForDeadPeds(void); @@ -589,6 +572,17 @@ public: void RemoveInCarAnims(void); void CollideWithPed(CPed*); void SetDirectionToWalkAroundObject(CEntity*); + void CreateDeadPedMoney(void); + void CreateDeadPedWeaponPickups(void); + void SetAttackTimer(uint32); + void SetBeingDraggedFromCar(CVehicle*, uint32, bool); + void SetRadioStation(void); + void SetBuyIceCream(void); + void SetChat(CEntity*, uint32); + void DeadPedMakesTyresBloody(void); + void MakeTyresMuddySectorList(CPtrList&); + uint8 DoesLOSBulletHitPed(CColPoint &point); + bool DuckAndCover(void); // Static methods static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset); @@ -645,6 +639,7 @@ public: void SetLeader(CEntity* leader); void SetPedStats(ePedStats); bool IsGangMember(void); + void Die(void); bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; } CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; } |