summaryrefslogtreecommitdiffstats
path: root/src/peds/PlayerPed.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-08-25 08:07:41 +0200
committerSergeanur <s.anureev@yandex.ua>2021-08-25 08:07:41 +0200
commit800ab9296056ceeb384985cb223566c981813919 (patch)
tree53e8190b7bb84a7b960abcec3044ce7cc2d73fbf /src/peds/PlayerPed.cpp
parentmodelinfo bits (diff)
parentAudio: refactoring, type fixes, renaming cAudioManager fields (diff)
downloadre3-800ab9296056ceeb384985cb223566c981813919.tar
re3-800ab9296056ceeb384985cb223566c981813919.tar.gz
re3-800ab9296056ceeb384985cb223566c981813919.tar.bz2
re3-800ab9296056ceeb384985cb223566c981813919.tar.lz
re3-800ab9296056ceeb384985cb223566c981813919.tar.xz
re3-800ab9296056ceeb384985cb223566c981813919.tar.zst
re3-800ab9296056ceeb384985cb223566c981813919.zip
Diffstat (limited to 'src/peds/PlayerPed.cpp')
-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 3e6509f5..4fb0ec29 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
+
}
}
}