diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-03-26 17:30:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 17:30:34 +0100 |
| commit | 9e49e5c2bd4526355410d647e353067fcfdcaf2d (patch) | |
| tree | 20e3c4233daef1d125464223cb0ed7ab23427e53 /src/vehicles | |
| parent | Merge pull request #355 from erorcun/erorcun (diff) | |
| parent | Update Fire.cpp (diff) | |
| download | re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.tar re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.tar.gz re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.tar.bz2 re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.tar.lz re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.tar.xz re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.tar.zst re3-9e49e5c2bd4526355410d647e353067fcfdcaf2d.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 1 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 90848d6c..ac0da52c 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -32,6 +32,7 @@ void CVehicle::operator delete(void *p, int handle) { CPools::GetVehiclePool()-> WRAPPER bool CVehicle::ShufflePassengersToMakeSpace(void) { EAXJMP(0x5528A0); } // or Weapon.cpp? WRAPPER void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage) { EAXJMP(0x563B00); } +WRAPPER void CVehicle::InflictDamage(CEntity *damagedBy, uint32 weaponType, float damage) { EAXJMP(0x551950); } CVehicle::CVehicle(uint8 CreatedBy) { diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index bd8df694..68b7b2ca 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -266,6 +266,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); bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; } CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); } |