OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Draw active powerups in columns of 3.

Browse source
This commit is contained in:
Mari the Deer 2023-11-26 20:45:51 +01:00
commit 50b124f1a1
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
zscript/hud/swwm_hud_inventory.zsc
View file

@ -64,23 +64,38 @@ extend Class SWWMStatusBar
xx += 36;
if ( CPlayer.mo.InvSel && !isInventoryBarVisible() ) yy -= 34;
}
int drawcnt = 0;
bool lastdrawn = false;
for ( Inventory i=CPlayer.mo.Inv; i; i=i.Inv )
{
if ( (drawcnt > 0) && !(drawcnt%3) && lastdrawn )
{
xx += 36;
yy = ss.y-(ymargin+invy+9);
if ( CPlayer.mo.InvSel && !isInventoryBarVisible() ) yy -= 34;
}
lastdrawn = false;
if ( (i is 'SWWMLamp') && (SWWMLamp(i).bActivated || (SWWMLamp(i).Charge < SWWMLamp(i).default.Charge)) )
{
DrawInvIcon(i,xx,yy,selected:true,aspowerup:true);
yy -= 34;
drawcnt++;
lastdrawn = true;
continue;
}
if ( (i is 'DivineSpriteEffect') && !DivineSpriteEffect(i).bHealDone )
{
DrawInvIcon(i,xx,yy,selected:true,aspowerup:true);
yy -= 34;
drawcnt++;
lastdrawn = true;
continue;
}
if ( !(i is 'Powerup') || (Powerup(i).EffectTics <= 0) || !(Powerup(i).Icon) ) continue;
if ( DrawInvIcon(i,xx,yy) )
yy -= 34;
if ( !DrawInvIcon(i,xx,yy) ) continue;
yy -= 34;
drawcnt++;
lastdrawn = true;
}
// inventory box / bar
if ( !CPlayer.mo.InvSel ) return;