diff options
author | aap <aap@papnet.eu> | 2019-07-09 18:50:35 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-09 18:50:35 +0200 |
commit | a65dd41da736a12866526abc1405cbaa154771a8 (patch) | |
tree | 387f8103d69d373341e67a6373f681a454aa06db /src/control | |
parent | more CAutomobile (diff) | |
download | re3-a65dd41da736a12866526abc1405cbaa154771a8.tar re3-a65dd41da736a12866526abc1405cbaa154771a8.tar.gz re3-a65dd41da736a12866526abc1405cbaa154771a8.tar.bz2 re3-a65dd41da736a12866526abc1405cbaa154771a8.tar.lz re3-a65dd41da736a12866526abc1405cbaa154771a8.tar.xz re3-a65dd41da736a12866526abc1405cbaa154771a8.tar.zst re3-a65dd41da736a12866526abc1405cbaa154771a8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Darkel.cpp | 8 | ||||
-rw-r--r-- | src/control/Darkel.h | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index f050a540..ab28f96e 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -123,18 +123,18 @@ eKillFrenzyStatus CDarkel::ReadStatus() } #if 1 -WRAPPER int32 CDarkel::RegisterCarBlownUpByPlayer(eKillFrenzyStatus status) { EAXJMP(0x421070); } +WRAPPER void CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle) { EAXJMP(0x421070); } #else -int32 CDarkel::RegisterCarBlownUpByPlayer(eKillFrenzyStatus status) +int32 CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle) { return 0; } #endif #if 1 -WRAPPER void CDarkel::RegisterKillByPlayer(int32 modelid, eWeaponType weapontype, bool flag) { EAXJMP(0x420F60); } +WRAPPER void CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapontype, bool headshot) { EAXJMP(0x420F60); } #else -void CDarkel::RegisterKillByPlayer(int32 modelid, eWeaponType weapontype, bool flag) +void CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapontype, bool headshot) { diff --git a/src/control/Darkel.h b/src/control/Darkel.h index da1df24a..35d849d2 100644 --- a/src/control/Darkel.h +++ b/src/control/Darkel.h @@ -1,6 +1,9 @@ #pragma once #include "Weapon.h" +class CVehicle; +class CPed; + enum eKillFrenzyStatus { KILLFRENZY_NONE, @@ -37,8 +40,8 @@ public: static void Init(); static int16 QueryModelsKilledByPlayer(int32 modelId); static eKillFrenzyStatus ReadStatus(); - static int32 RegisterCarBlownUpByPlayer(eKillFrenzyStatus status); - static void RegisterKillByPlayer(int32 modelid, eWeaponType weapontype, bool flag); + static void RegisterCarBlownUpByPlayer(CVehicle *vehicle); + static void RegisterKillByPlayer(CPed *victim, eWeaponType weapontype, bool headshot = false); static void RegisterKillNotByPlayer(); static void ResetModelsKilledByPlayer(); static void ResetOnPlayerDeath(); |