diff options
author | aap <aap@papnet.eu> | 2020-04-03 11:49:33 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-04-03 11:49:33 +0200 |
commit | 3b315fec264d1200ab08aa76e93a07859ebb24c1 (patch) | |
tree | 5820b697cb24dc935d9d52f23babf36798319d97 /src/vehicles/Vehicle.h | |
parent | CCamera fixes (diff) | |
parent | Merge pull request #377 from Fire-Head/master (diff) | |
download | re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.gz re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.bz2 re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.lz re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.xz re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.tar.zst re3-3b315fec264d1200ab08aa76e93a07859ebb24c1.zip |
Diffstat (limited to 'src/vehicles/Vehicle.h')
-rw-r--r-- | src/vehicles/Vehicle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 2ca97841..4639f3e1 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -4,6 +4,7 @@ #include "AutoPilot.h" #include "ModelIndices.h" #include "AnimManager.h" +#include "Weapon.h" class CPed; class CFire; @@ -266,7 +267,7 @@ public: void ProcessCarAlarm(void); bool IsSphereTouchingVehicle(float sx, float sy, float sz, float radius); bool ShufflePassengersToMakeSpace(void); - void InflictDamage(CEntity *damagedBy, uint32 weaponType, float damage); + void InflictDamage(CEntity *damagedBy, eWeaponType weaponType, float damage); bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; } CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); } |