diff options
Diffstat (limited to 'src/control/Darkel.cpp')
| -rw-r--r-- | src/control/Darkel.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index 1356638f..722ebbcd 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -16,7 +16,7 @@ #include "Vehicle.h" #include "GameLogic.h" -//--MIAMI: file done except TODO +//--MIAMI: file done #define FRENZY_ANY_PED -1 #define FRENZY_ANY_CAR -2 @@ -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); @@ -403,6 +408,6 @@ CDarkel::DealWithWeaponChangeAtEndOfFrenzy() FindPlayerPed()->m_nSelectedWepSlot = WEAPONSLOT_UNARMED; player->SetCurrentWeapon(FindPlayerPed()->m_nSelectedWepSlot); player->MakeChangesForNewWeapon(player->m_currentWeapon); - //player->RemoveDriveByAnims(); // TODO(MIAMI) + player->RemoveDrivebyAnims(); } } |