From 458d0560042a6e5057be4e8e72563250fe4e9438 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Sat, 17 Jul 2021 09:14:08 +1000
Subject: [PATCH] - Blood: Repair weapon switching issue by adding missing
 guard from
 https://github.com/nukeykt/NBlood/commit/6980e8b35527dfba1f994d97bef58505773a26ec
 that got lost during e375c799ce4c970cd213ae3a2762562fd0d74bb9.

* Fixes #366.
---
 source/games/blood/src/weapon.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/games/blood/src/weapon.cpp b/source/games/blood/src/weapon.cpp
index f180a30926a..dd103b010d3 100644
--- 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)
     {