From 8fcfc878b3d5e42f515a1ae7297f7eb3045a3aa6 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 4 Jul 2023 17:19:09 +0200
Subject: [PATCH] Fix weapon bar with automap active.

---
 language.version                         | 4 ++--
 zscript/handler/swwm_handler_process.zsc | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/language.version b/language.version
index f5b9a9e0f..ab8427132 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r823 \cu(Tue  4 Jul 17:05:21 CEST 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r823 \cu(2023-07-04 17:05:21)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r824 \cu(Tue  4 Jul 17:19:09 CEST 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r824 \cu(2023-07-04 17:19:09)\c-";
diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc
index 86d4b5ff0..41cd7e6d8 100644
--- a/zscript/handler/swwm_handler_process.zsc
+++ b/zscript/handler/swwm_handler_process.zsc
@@ -575,6 +575,9 @@ extend Class SWWMHandler
 		}
 		else if ( WeapSel && swwm_useweaponbar && !paused && (players[consoleplayer].playerstate == PST_LIVE) && players[consoleplayer].mo && (gamestate == GS_LEVEL) )
 		{
+			// special case: ignore if we used the mousewheel and the automap is active
+			if ( automapactive && ((e.KeyScan == InputEvent.Key_MWheelUp) || (e.KeyScan == InputEvent.Key_MWheelDown)) )
+				return false;
 			// only if player owns any selectable weapons
 			if ( !wsel && SWWMWeaponSelect.PlayerHasWeapons(players[consoleplayer].mo) )
 			{