diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-10-06 23:39:25 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-10-06 23:39:25 +0200 |
| commit | d5d1c7ec5fc98f8355d812587938314406a6df80 (patch) | |
| tree | e1652a9c39e77bd1bc8b81973fccbe91eb3d8eae /src/control | |
| parent | Radio shadow fix, RAMPAGE!! message fix (diff) | |
| download | re3-d5d1c7ec5fc98f8355d812587938314406a6df80.tar re3-d5d1c7ec5fc98f8355d812587938314406a6df80.tar.gz re3-d5d1c7ec5fc98f8355d812587938314406a6df80.tar.bz2 re3-d5d1c7ec5fc98f8355d812587938314406a6df80.tar.lz re3-d5d1c7ec5fc98f8355d812587938314406a6df80.tar.xz re3-d5d1c7ec5fc98f8355d812587938314406a6df80.tar.zst re3-d5d1c7ec5fc98f8355d812587938314406a6df80.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Cranes.cpp | 1 | ||||
| -rw-r--r-- | src/control/Cranes.h | 1 | ||||
| -rw-r--r-- | src/control/Darkel.cpp | 6 | ||||
| -rw-r--r-- | src/control/Darkel.h | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/control/Cranes.cpp b/src/control/Cranes.cpp index f641bc75..9610e37a 100644 --- a/src/control/Cranes.cpp +++ b/src/control/Cranes.cpp @@ -3,3 +3,4 @@ #include "Cranes.h" WRAPPER bool CCranes::IsThisCarBeingTargettedByAnyCrane(CVehicle*) { EAXJMP(0x5451E0); } +WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
\ No newline at end of file diff --git a/src/control/Cranes.h b/src/control/Cranes.h index e262d0c3..3af2c9bc 100644 --- a/src/control/Cranes.h +++ b/src/control/Cranes.h @@ -7,4 +7,5 @@ class CCranes { public: static bool IsThisCarBeingTargettedByAnyCrane(CVehicle*); + static bool IsThisCarBeingCarriedByAnyCrane(CVehicle*); }; diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index da28faa7..915e280a 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -28,8 +28,8 @@ int8 &CDarkel::InterruptedWeapon = *(int8*)0x95CD60; int8 &CDarkel::bStandardSoundAndMessages = *(int8*)0x95CDB6; int8 &CDarkel::bNeedHeadShot = *(int8*)0x95CDCA; int8 &CDarkel::bProperKillFrenzy = *(int8*)0x95CD98; -eKillFrenzyStatus &CDarkel::Status = *(eKillFrenzyStatus*)0x95CCB4; -uint16 (&CDarkel::RegisteredKills)[NUMDEFAULTMODELS] = *(uint16(*)[NUMDEFAULTMODELS]) * (uintptr*)0x6EDBE0; +uint16 &CDarkel::Status = *(uint16*)0x95CCB4; +uint16 (&CDarkel::RegisteredKills)[NUM_DEFAULT_MODELS] = *(uint16(*)[NUM_DEFAULT_MODELS]) * (uintptr*)0x6EDBE0; int32 &CDarkel::ModelToKill = *(int32*)0x8F2C78; int32 &CDarkel::ModelToKill2 = *(int32*)0x885B40; int32 &CDarkel::ModelToKill3 = *(int32*)0x885B3C; @@ -185,7 +185,7 @@ CDarkel::RegisterKillNotByPlayer(CPed* victim, eWeaponType weapontype) void CDarkel::ResetModelsKilledByPlayer() { - for (int i = 0; i < NUMDEFAULTMODELS; i++) + for (int i = 0; i < NUM_DEFAULT_MODELS; i++) RegisteredKills[i] = 0; } diff --git a/src/control/Darkel.h b/src/control/Darkel.h index 0171cd2c..f17d7581 100644 --- a/src/control/Darkel.h +++ b/src/control/Darkel.h @@ -1,10 +1,11 @@ #pragma once #include "Weapon.h" +#include "ModelIndices.h" class CVehicle; class CPed; -enum eKillFrenzyStatus +enum { KILLFRENZY_NONE, KILLFRENZY_ONGOING, @@ -25,8 +26,8 @@ private: static int8 &bStandardSoundAndMessages; static int8 &bNeedHeadShot; static int8 &bProperKillFrenzy; - static eKillFrenzyStatus &Status; - static uint16 (&RegisteredKills)[NUMDEFAULTMODELS]; + static uint16 &Status; + static uint16 (&RegisteredKills)[NUM_DEFAULT_MODELS]; static int32 &ModelToKill; static int32 &ModelToKill2; static int32 &ModelToKill3; |