summaryrefslogtreecommitdiffstats
path: root/src/control/Darkel.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-03-29 16:27:42 +0200
committerGitHub <noreply@github.com>2020-03-29 16:27:42 +0200
commit82dcc34296465df07a89d081f40c60a6c7424400 (patch)
tree40252c18f35d0aec836a4cbf44b3ff1823524470 /src/control/Darkel.cpp
parentMerge pull request #368 from aap/master (diff)
parentWrappers cleanup (diff)
downloadre3-82dcc34296465df07a89d081f40c60a6c7424400.tar
re3-82dcc34296465df07a89d081f40c60a6c7424400.tar.gz
re3-82dcc34296465df07a89d081f40c60a6c7424400.tar.bz2
re3-82dcc34296465df07a89d081f40c60a6c7424400.tar.lz
re3-82dcc34296465df07a89d081f40c60a6c7424400.tar.xz
re3-82dcc34296465df07a89d081f40c60a6c7424400.tar.zst
re3-82dcc34296465df07a89d081f40c60a6c7424400.zip
Diffstat (limited to 'src/control/Darkel.cpp')
-rw-r--r--src/control/Darkel.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index ec1b887e..b4d15abf 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -162,9 +162,6 @@ CDarkel::ReadStatus()
return Status;
}
-#if 0
-WRAPPER void CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle) { EAXJMP(0x421070); }
-#else
void
CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
{
@@ -178,11 +175,7 @@ CDarkel::RegisterCarBlownUpByPlayer(CVehicle *vehicle)
RegisteredKills[vehicle->GetModelIndex()]++;
CStats::CarsExploded++;
}
-#endif
-#if 0
-WRAPPER void CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapontype, bool headshot) { EAXJMP(0x420F60); }
-#else
void
CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
{
@@ -207,7 +200,6 @@ CDarkel::RegisterKillByPlayer(CPed *victim, eWeaponType weapon, bool headshot)
CStats::HeadsPopped++;
CStats::KillsSinceLastCheckpoint++;
}
-#endif
void
CDarkel::RegisterKillNotByPlayer(CPed* victim, eWeaponType weapontype)
@@ -222,9 +214,6 @@ CDarkel::ResetModelsKilledByPlayer()
RegisteredKills[i] = 0;
}
-#if 0
-WRAPPER void CDarkel::ResetOnPlayerDeath() { EAXJMP(0x420E70); }
-#else
void
CDarkel::ResetOnPlayerDeath()
{
@@ -253,11 +242,7 @@ CDarkel::ResetOnPlayerDeath()
player->MakeChangesForNewWeapon(player->m_currentWeapon);
}
}
-#endif
-#if 0
-WRAPPER void CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 modelId0, wchar *text, int32 modelId2, int32 modelId3, int32 modelId4, bool standardSound, bool needHeadShot) { EAXJMP(0x4210E0); }
-#else
void
CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 modelId0, wchar *text, int32 modelId2, int32 modelId3, int32 modelId4, bool standardSound, bool needHeadShot)
{
@@ -306,7 +291,6 @@ CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 mode
if (CDarkel::bStandardSoundAndMessages)
DMAudio.PlayFrontEndSound(SOUND_RAMPAGE_START, 0);
}
-#endif
void
CDarkel::Update()