From df88b23f6369a7b3bffc3dec1ad913a499a29bf9 Mon Sep 17 00:00:00 2001
From: Mitch Richters <mjr4077au@gmail.com>
Date: Tue, 19 Oct 2021 11:20:44 +1100
Subject: [PATCH] - Blood: Backport GDX fix for lighter just appearing when
 switching to the aerosol.

* Fixes #564.
* Thanks to @carnivoroussociety for the heads up.
---
 source/games/blood/src/weapon.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source/games/blood/src/weapon.cpp b/source/games/blood/src/weapon.cpp
index 140d423db..d0b4af65b 100644
--- a/source/games/blood/src/weapon.cpp
+++ b/source/games/blood/src/weapon.cpp
@@ -836,6 +836,14 @@ void WeaponLower(PLAYER *pPlayer)
     }
     pPlayer->curWeapon = kWeapNone;
     pPlayer->qavLoop = 0;
+
+    // BloodGDX fix for aerosol lighter just appearing when switching to it.
+    // https://gitlab.com/m210/BloodGDX/-/commit/bea4dedd0c429eb9639333165b6f656483c9a7f7
+    if(!VanillaMode() && pPlayer->curWeapon != kWeapDynamite)
+    {
+        pPlayer->weaponState = 0;
+    }
+
 }
 
 void WeaponUpdateState(PLAYER *pPlayer)