mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-29 04:45:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug about switching to previous weapon unintendedly

Browse source
This commit is contained in:
erorcun 2021-08-21 16:34:26 +03:00
parent 7c80093efa
commit d4ce6bcde0
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/peds/PlayerPed.cpp
View file

@ -729,10 +729,17 @@ CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
for (m_nSelectedWepSlot = m_currentWeapon + 1; m_nSelectedWepSlot < TOTAL_WEAPON_SLOTS; ++m_nSelectedWepSlot) { for (m_nSelectedWepSlot = m_currentWeapon + 1; m_nSelectedWepSlot < TOTAL_WEAPON_SLOTS; ++m_nSelectedWepSlot) {
if (HasWeaponSlot(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) { if (HasWeaponSlot(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) {
#ifdef FIX_BUGS
goto switchDetectDone;
#else
goto spentAmmoCheck; goto spentAmmoCheck;
#endif
} }
} }
m_nSelectedWepSlot = 0; m_nSelectedWepSlot = 0;
#ifdef FIX_BUGS
goto switchDetectDone;
#endif
} }
} else if (padUsed->CycleWeaponLeftJustDown()) { } else if (padUsed->CycleWeaponLeftJustDown()) {
if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
@ -754,6 +761,10 @@ CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
--m_nSelectedWepSlot; --m_nSelectedWepSlot;
} while (m_nSelectedWepSlot != WEAPONSLOT_UNARMED); } while (m_nSelectedWepSlot != WEAPONSLOT_UNARMED);
#ifdef FIX_BUGS
goto switchDetectDone;
#endif
} }
} }
} }