summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2021-08-21 15:34:26 +0200
committererorcun <erorcunerorcun@hotmail.com.tr>2021-08-21 15:34:26 +0200
commitd4ce6bcde04ad85971bb9790ae7914027823423e (patch)
tree08f9224320b06c98cf76ff93ded36f3369f0c3de /src/peds
parentRemove cMissionAudio, move cAMCrime array outside of cPoliceRadioQueue (R* vision) (diff)
downloadre3-d4ce6bcde04ad85971bb9790ae7914027823423e.tar
re3-d4ce6bcde04ad85971bb9790ae7914027823423e.tar.gz
re3-d4ce6bcde04ad85971bb9790ae7914027823423e.tar.bz2
re3-d4ce6bcde04ad85971bb9790ae7914027823423e.tar.lz
re3-d4ce6bcde04ad85971bb9790ae7914027823423e.tar.xz
re3-d4ce6bcde04ad85971bb9790ae7914027823423e.tar.zst
re3-d4ce6bcde04ad85971bb9790ae7914027823423e.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/PlayerPed.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 2c6330aa..b3fe0ff0 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -729,10 +729,17 @@ CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
for (m_nSelectedWepSlot = m_currentWeapon + 1; m_nSelectedWepSlot < TOTAL_WEAPON_SLOTS; ++m_nSelectedWepSlot) {
if (HasWeaponSlot(m_nSelectedWepSlot) && GetWeapon(m_nSelectedWepSlot).HasWeaponAmmoToBeUsed()) {
+#ifdef FIX_BUGS
+ goto switchDetectDone;
+#else
goto spentAmmoCheck;
+#endif
}
}
m_nSelectedWepSlot = 0;
+#ifdef FIX_BUGS
+ goto switchDetectDone;
+#endif
}
} else if (padUsed->CycleWeaponLeftJustDown()) {
if (TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
@@ -754,6 +761,10 @@ CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
--m_nSelectedWepSlot;
} while (m_nSelectedWepSlot != WEAPONSLOT_UNARMED);
+#ifdef FIX_BUGS
+ goto switchDetectDone;
+#endif
+
}
}
}