diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-09 04:34:04 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-09 04:34:04 +0100 |
| commit | ba0c9e8b295cc988077df68a71573d3ebcff2b60 (patch) | |
| tree | 0532f46e3335ca84ff32caa4884a145ba06e0e10 /src/peds | |
| parent | Frontend cleanup, .INI, CFO, scrollable pages (diff) | |
| parent | Merge pull request #872 from withmorten/sized-enums-miami (diff) | |
| download | re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.gz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.bz2 re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.lz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.xz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.zst re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.h | 10 | ||||
| -rw-r--r-- | src/peds/PedFight.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 608bb710..f8638c4b 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -52,7 +52,7 @@ enum eFormation FORMATION_FRONT }; -enum FightState : int8 { +enum FightState { FIGHTSTATE_MOVE_FINISHED = -2, FIGHTSTATE_JUST_ATTACKED, FIGHTSTATE_NO_MOVE, @@ -187,7 +187,7 @@ enum eWaitState { WAITSTATE_PLAYANIM_HANDSUP_SIMPLE, }; -enum eObjective : uint32 { +enum eObjective { OBJECTIVE_NONE, OBJECTIVE_WAIT_ON_FOOT, OBJECTIVE_WAIT_ON_FOOT_FOR_COP, @@ -271,7 +271,7 @@ enum PedOnGroundState { PED_DEAD_ON_THE_FLOOR }; -enum PointBlankNecessity : uint8 { +enum PointBlankNecessity { NO_POINT_BLANK_PED, POINT_BLANK_FOR_WANTED_PED, POINT_BLANK_FOR_SOMEONE_ELSE @@ -598,7 +598,7 @@ public: uint32 m_curFightMove; uint32 m_lastFightMove; uint8 m_fightButtonPressure; - FightState m_fightState; + int8 m_fightState; bool m_takeAStepAfterAttack; uint8 m_bleedCounter; CFire *m_pFire; @@ -729,7 +729,7 @@ public: CPed *CheckForDeadPeds(void); bool CheckForExplosions(CVector2D &area); CPed *CheckForGunShots(void); - PointBlankNecessity CheckForPointBlankPeds(CPed*); + uint8 CheckForPointBlankPeds(CPed*); bool CheckIfInTheAir(void); void ClearAll(void); void SetPointGunAt(CEntity*); diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index 0367ef4c..855a0f1f 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -367,7 +367,7 @@ CPed::SetAttack(CEntity *victim) if (IsPlayer()) CPad::GetPad(0)->ResetAverageWeapon(); - PointBlankNecessity pointBlankStatus; + uint8 pointBlankStatus; if ((curWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT || GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER) && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON && TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT @@ -611,7 +611,7 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg) } // --MIAMI: Done -PointBlankNecessity +uint8 CPed::CheckForPointBlankPeds(CPed *pedToVerify) { float pbDistance = 1.1f; |