diff options
| author | withmorten <morten.with@gmail.com> | 2020-12-07 01:59:17 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2020-12-07 01:59:17 +0100 |
| commit | 4c0744260d2a7c1d9e015359edc58affb975fa03 (patch) | |
| tree | 2d32e1f4658266e39c65937c1197c7277f51a487 /src/peds | |
| parent | int8 enums fixed (diff) | |
| download | re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.gz re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.bz2 re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.lz re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.xz re3-4c0744260d2a7c1d9e015359edc58affb975fa03.tar.zst re3-4c0744260d2a7c1d9e015359edc58affb975fa03.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.h | 4 | ||||
| -rw-r--r-- | src/peds/PedFight.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index 343e9b22..f8638c4b 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -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 @@ -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; |