diff options
| author | aap <aap@papnet.eu> | 2020-04-03 11:48:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 11:48:49 +0200 |
| commit | db804f99d95de44b64ef71f18948fddada996df8 (patch) | |
| tree | 0fac3f0aa7ef5530f9236e4b134dbe13b2f2c9af /src/vehicles/Vehicle.h | |
| parent | Fix CFont type uint16 -> wchar (diff) | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | re3-db804f99d95de44b64ef71f18948fddada996df8.tar re3-db804f99d95de44b64ef71f18948fddada996df8.tar.gz re3-db804f99d95de44b64ef71f18948fddada996df8.tar.bz2 re3-db804f99d95de44b64ef71f18948fddada996df8.tar.lz re3-db804f99d95de44b64ef71f18948fddada996df8.tar.xz re3-db804f99d95de44b64ef71f18948fddada996df8.tar.zst re3-db804f99d95de44b64ef71f18948fddada996df8.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()); } |