From 93a4bc31fa767df0460d1e66e97f30c863cdc1bf Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Wed, 25 Mar 2020 22:57:34 +0100
Subject: added wrapper for InflictDamage()

---
 src/vehicles/Vehicle.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/vehicles')

diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 90848d6c..6aa12841 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(CVehicle *damagedBy, uint32 weaponType, float damage) { EAXJMP(0x551950); }
 
 CVehicle::CVehicle(uint8 CreatedBy)
 {
-- 
cgit v1.2.3


From be2aca47cfa84626ded8c140e5f8cf4af5f1a055 Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Wed, 25 Mar 2020 22:58:20 +0100
Subject: added InflictDamage() declaration

---
 src/vehicles/Vehicle.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/vehicles')

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()); }
-- 
cgit v1.2.3


From 0e9101594031fb9468d639ab6e4b57449cd8997c Mon Sep 17 00:00:00 2001
From: blingu <36486731+blingu@users.noreply.github.com>
Date: Thu, 26 Mar 2020 14:19:55 +0100
Subject: Update Vehicle.cpp

---
 src/vehicles/Vehicle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/vehicles')

diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 6aa12841..ac0da52c 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -32,7 +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(CVehicle *damagedBy, uint32 weaponType, float damage) { EAXJMP(0x551950); }
+WRAPPER void CVehicle::InflictDamage(CEntity *damagedBy, uint32 weaponType, float damage) { EAXJMP(0x551950); }
 
 CVehicle::CVehicle(uint8 CreatedBy)
 {
-- 
cgit v1.2.3