From 8a4b4ab6a1a9fba973c8a822ccb6e1b1f1379be0 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 21 Jun 2020 17:00:29 +0200 Subject: [PATCH] Minor detail: current slot stays highlighted when gesturing. --- language.version | 2 +- zmapinfo.txt | 3 ++- zscript/swwm_hud.zsc | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index 2d9a5b4fa..9baa32a92 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r372 (Sun 21 Jun 14:25:15 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r373 (Sun 21 Jun 17:00:29 CEST 2020)"; diff --git a/zmapinfo.txt b/zmapinfo.txt index 008561055..624d23b1a 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -29,7 +29,8 @@ GameInfo "Sparkster", "SilverBullet", "CandyGun", - "Ynykron" + "Ynykron", + "SWWMGesture" // precache very long stuff PrecacheSounds = "wallbuster/olddays", "wallbuster/cbt" diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index 074473e19..2c14d8c1b 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -933,7 +933,11 @@ Class SWWMStatusBar : BaseStatusBar for ( int i=1; i<=10; i++ ) { int ncolor = Font.CR_WHITE; + SWWMGesture hasgesture = null; + if ( CPlayer.PendingWeapon is 'SWWMGesture' ) hasgesture = SWWMGesture(CPlayer.PendingWeapon); + else if ( CPlayer.ReadyWeapon is 'SWWMGesture' ) hasgesture = SWWMGesture(CPlayer.ReadyWeapon); if ( !CPlayer.HasWeaponsInSlot(i%10) ) ncolor = Font.CR_DARKGRAY; + else if ( hasgesture && (hasgesture.formerweapon.SlotNumber == (i%10)) ) ncolor = Font.CR_FIRE; else if ( CPlayer.PendingWeapon && (CPlayer.PendingWeapon != WP_NOCHANGE) && (CPlayer.PendingWeapon.SlotNumber == (i%10)) ) ncolor = Font.CR_FIRE; else if ( (!CPlayer.PendingWeapon || (CPlayer.PendingWeapon == WP_NOCHANGE)) && CPlayer.ReadyWeapon && (CPlayer.ReadyWeapon.SlotNumber == (i%10)) ) ncolor = Font.CR_FIRE; else