summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2020-12-07 00:36:40 +0100
committerwithmorten <morten.with@gmail.com>2020-12-07 00:36:40 +0100
commit4696e3f9c88cdf9e025205b0b525dec8c310b671 (patch)
tree635faa0dc5ff4ce5798dae7a3509042b73c63e46 /src/peds
parentfixed parenthesis (diff)
downloadre3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.gz
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.bz2
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.lz
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.xz
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.tar.zst
re3-4696e3f9c88cdf9e025205b0b525dec8c310b671.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.h4
-rw-r--r--src/peds/PedFight.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index a3d4997d..7a9f4a9e 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -212,7 +212,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:
#endif
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 21310aaa..c219d94f 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -329,7 +329,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
@@ -475,7 +475,7 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
ped->ClearAttack();
}
-PointBlankNecessity
+uint8
CPed::CheckForPointBlankPeds(CPed *pedToVerify)
{
float pbDistance = 1.1f;