diff options
author | aap <aap@papnet.eu> | 2019-08-02 14:02:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-02 14:02:02 +0200 |
commit | e30cfaf6871073ba56a5245d4d1b4da0eab784a3 (patch) | |
tree | 73434501fcd8b2167daf88c83c5a1e0f40671780 /src/control/Darkel.cpp | |
parent | implemented CPlane (diff) | |
parent | The Peds (diff) | |
download | re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.gz re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.bz2 re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.lz re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.xz re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.tar.zst re3-e30cfaf6871073ba56a5245d4d1b4da0eab784a3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Darkel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Darkel.cpp b/src/control/Darkel.cpp index ad8d1176..670c10fb 100644 --- a/src/control/Darkel.cpp +++ b/src/control/Darkel.cpp @@ -168,7 +168,7 @@ void CDarkel::ResetOnPlayerDeath() WeaponType = WEAPONTYPE_UZI; if (WeaponType < WEAPONTYPE_TOTALWEAPONS) { - FindPlayerPed()->m_bWeaponSlot = InterruptedWeapon; + FindPlayerPed()->m_nSelectedWepSlot = InterruptedWeapon; CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_nAmmoTotal = AmmoInterruptedWeapon; } @@ -187,7 +187,7 @@ void CDarkel::ResetOnPlayerDeath() WeaponType = WEAPONTYPE_UZI; if (WeaponType < WEAPONTYPE_TOTALWEAPONS) { - FindPlayerPed()->m_bWeaponSlot = InterruptedWeapon; + FindPlayerPed()->m_nSelectedWepSlot = InterruptedWeapon; CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_nAmmoTotal = AmmoInterruptedWeapon; } @@ -234,8 +234,8 @@ void CDarkel::StartFrenzy(eWeaponType weaponType, int32 time, int16 kill, int32 FindPlayerPed()->GiveWeapon(weaponType, 0); AmmoInterruptedWeapon = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_nAmmoTotal; FindPlayerPed()->GiveWeapon(weaponType, 30000); - FindPlayerPed()->m_bWeaponSlot = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_eWeaponType; - FindPlayerPed()->MakeChangesForNewWeapon(FindPlayerPed()->m_bWeaponSlot); + FindPlayerPed()->m_nSelectedWepSlot = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_eWeaponType; + FindPlayerPed()->MakeChangesForNewWeapon(FindPlayerPed()->m_nSelectedWepSlot); if (FindPlayerVehicle()) { FindPlayerPed()->m_currentWeapon = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_eWeaponType; @@ -277,7 +277,7 @@ void CDarkel::Update() WeaponType = WEAPONTYPE_UZI; if (WeaponType < WEAPONTYPE_TOTALWEAPONS) { - FindPlayerPed()->m_bWeaponSlot = InterruptedWeapon; + FindPlayerPed()->m_nSelectedWepSlot = InterruptedWeapon; CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_nAmmoTotal = AmmoInterruptedWeapon; } @@ -306,7 +306,7 @@ void CDarkel::Update() WeaponType = WEAPONTYPE_UZI; if (WeaponType < WEAPONTYPE_TOTALWEAPONS) { - FindPlayerPed()->m_bWeaponSlot = InterruptedWeapon; + FindPlayerPed()->m_nSelectedWepSlot = InterruptedWeapon; CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_weapons[CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_currentWeapon].m_nAmmoTotal = AmmoInterruptedWeapon; } |