OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix weapon bar with automap active.

Browse source
This commit is contained in:
Mari the Deer 2023-07-04 17:19:09 +02:00
commit 8fcfc878b3
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -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-";

3
zscript/handler/swwm_handler_process.zsc
View file

@ -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) )
{