From c8f0ea32da997e68acb7e1e354d94697e0e57376 Mon Sep 17 00:00:00 2001
From: Arsinikk <61759217+andrikpowell@users.noreply.github.com>
Date: Tue, 18 Feb 2025 00:39:47 -0600
Subject: [PATCH] Fix Vanilla Weapon Switch Logic (Example: Dehacked Chainsaw
 with Ammo) (#605)

---
 src/p_pspr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/p_pspr.c b/src/p_pspr.c
index 826b534d..231d5964 100644
--- a/src/p_pspr.c
+++ b/src/p_pspr.c
@@ -279,6 +279,10 @@ int P_SwitchWeapon(player_t *player)
   if (mbf21)
     return P_SwitchWeaponMBF21(player);
 
+  // Fix weapon switch logic in vanilla (example: chainsaw with ammo)
+  if (demo_compatibility)
+    currentweapon = newweapon = wp_nochange;
+
   // killough 2/8/98: follow preferences and fix BFG/SSG bugs
 
   do