diff --git a/language.version b/language.version index cc812e6c5..4f040a727 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1024 \cu(Sun 26 Nov 18:33:53 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1024 \cu(2023-11-26 18:33:53)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1024 \cu(Sun 26 Nov 20:45:51 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1024 \cu(2023-11-26 20:45:51)\c-"; diff --git a/zscript/hud/swwm_hud_inventory.zsc b/zscript/hud/swwm_hud_inventory.zsc index 928b25992..490ad1ea1 100644 --- a/zscript/hud/swwm_hud_inventory.zsc +++ b/zscript/hud/swwm_hud_inventory.zsc @@ -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;