Minor detail: current slot stays highlighted when gesturing.

This commit is contained in:
Mari the Deer 2020-06-21 17:00:29 +02:00
commit 8a4b4ab6a1
3 changed files with 7 additions and 2 deletions

View file

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

View file

@ -29,7 +29,8 @@ GameInfo
"Sparkster",
"SilverBullet",
"CandyGun",
"Ynykron"
"Ynykron",
"SWWMGesture"
// precache very long stuff
PrecacheSounds = "wallbuster/olddays",
"wallbuster/cbt"

View file

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