summaryrefslogtreecommitdiffstats
path: root/src/control/Darkel.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-12-12 10:24:55 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2020-12-12 10:24:55 +0100
commit4197498e2dab59916c0a41843b430d8a26b485f9 (patch)
treea79b612c1d1874219315da549943a55d25861f52 /src/control/Darkel.cpp
parentMerge pull request #869 from Nick007J/miami (diff)
downloadre3-4197498e2dab59916c0a41843b430d8a26b485f9.tar
re3-4197498e2dab59916c0a41843b430d8a26b485f9.tar.gz
re3-4197498e2dab59916c0a41843b430d8a26b485f9.tar.bz2
re3-4197498e2dab59916c0a41843b430d8a26b485f9.tar.lz
re3-4197498e2dab59916c0a41843b430d8a26b485f9.tar.xz
re3-4197498e2dab59916c0a41843b430d8a26b485f9.tar.zst
re3-4197498e2dab59916c0a41843b430d8a26b485f9.zip
Diffstat (limited to '')
-rw-r--r--src/control/Darkel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp
index 0f68a989..722ebbcd 100644
--- a/src/control/Darkel.cpp
+++ b/src/control/Darkel.cpp
@@ -295,11 +295,16 @@ CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, uint16 kill, int32 mode
CPlayerPed *player = FindPlayerPed();
if (fixedWeapon < WEAPONTYPE_TOTALWEAPONS) {
InterruptedWeaponSelected = player->GetWeapon()->m_eWeaponType;
+#if (defined FIX_BUGS || !defined GTA_PS2)
player->RemoveWeaponAnims(InterruptedWeaponSelected, -1000.0f);
+#endif
InterruptedWeaponType = player->GetWeapon(player->GetWeaponSlot(fixedWeapon)).m_eWeaponType;
AmmoInterruptedWeapon = player->GetWeapon(player->GetWeaponSlot(fixedWeapon)).m_nAmmoTotal;
if (InterruptedWeaponType)
CModelInfo::GetModelInfo(CWeaponInfo::GetWeaponInfo((eWeaponType)InterruptedWeaponType)->m_nModelId)->AddRef();
+#if (!defined FIX_BUGS && defined GTA_PS2)
+ player->RemoveWeaponAnims(InterruptedWeaponSelected, -1000.0f);
+#endif
player->GiveWeapon(fixedWeapon, 30000);
player->SetCurrentWeapon(fixedWeapon);
player->MakeChangesForNewWeapon(player->m_nSelectedWepSlot);