- Blood: Repair weapon switching issue by adding missing guard from n…

…ukeykt/NBlood@6980e8b that got lost during e375c79. * Fixes #366.
ZDoom · Jul 17, 2021 · 458d056 · 458d056
1 parent 2c41d21
commit 458d056
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/source/games/blood/src/weapon.cpp b/source/games/blood/src/weapon.cpp
@@ -2086,12 +2086,15 @@ void WeaponProcess(PLAYER *pPlayer) {
             return;
         break;
     }
-    if (pPlayer->nextWeapon)
+    if (VanillaMode())
     {
-        sfxKill3DSound(pPlayer->pSprite, -1, 441);
-        pPlayer->weaponState = 0;
-        pPlayer->newWeapon = pPlayer->nextWeapon;
-        pPlayer->nextWeapon = 0;
+        if (pPlayer->nextWeapon)
+        {
+            sfxKill3DSound(pPlayer->pSprite, -1, 441);
+            pPlayer->weaponState = 0;
+            pPlayer->newWeapon = pPlayer->nextWeapon;
+            pPlayer->nextWeapon = 0;
+        }
     }
     if (pPlayer->input.getNewWeapon() == WeaponSel_Next)
     {