diff --git a/language.version b/language.version index a3f1db5c2..db0eaf786 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1108 \cu(Mon 26 Feb 22:06:04 CET 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1108 \cu(2024-02-26 22:06:04)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1109 \cu(Wed 6 Mar 20:03:50 CET 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1109 \cu(2024-03-06 20:03:50)\c-"; diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 8d7864f56..9e4ec66ca 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -625,11 +625,6 @@ Class SWWMStatusBar : BaseStatusBar } Super.Draw(state,TicFrac); FrameTime = (CurFrame-PrevFrame)/1000.; - if ( (state != HUD_StatusBar) && (state != HUD_Fullscreen) ) - { - PrevFrame = CurFrame; - return; - } if ( !hnd ) hnd = SWWMHandler(EventHandler.Find("SWWMHandler")); hsA = max(min(floor(Screen.GetWidth()/640.),floor(Screen.GetHeight()/360.)),1.); hsT = max(min(floor(Screen.GetWidth()/480.),floor(Screen.GetHeight()/270.)),1.); @@ -660,6 +655,16 @@ Class SWWMStatusBar : BaseStatusBar // calculate vertical margin for hudscale0 (relative to base hudscale) ymargin0 = int(ymargin*(hs/hs0)); FracTic = TicFrac; + if ( (state != HUD_StatusBar) && (state != HUD_Fullscreen) ) + { + if ( state == HUD_AltHud ) + { + String str = StringTable.Localize("$SWWM_WARNALTHUD"); + Screen.DrawText(NewSmallFont,Font.CR_RED,(ss0.x-NewSmallFont.StringWidth(str))/2,ymargin0,str,DTA_VirtualWidthF,ss0.x,DTA_VirtualHeightF,ss0.y,DTA_KeepRatio,true); + } + PrevFrame = CurFrame; + return; + } if ( (players[consoleplayer].Camera is 'Demolitionist') && (state <= HUD_Fullscreen) ) { DrawTarget(); @@ -672,11 +677,6 @@ Class SWWMStatusBar : BaseStatusBar DrawPickups(); double malph = DrawDeath(); DrawMessages(malph); - if ( state == HUD_AltHud ) - { - String str = StringTable.Localize("$SWWM_WARNALTHUD"); - Screen.DrawText(NewSmallFont,Font.CR_RED,(ss0.x-NewSmallFont.StringWidth(str))/2,ymargin0,str,DTA_VirtualWidthF,ss0.x,DTA_VirtualHeightF,ss0.y,DTA_KeepRatio,true); - } PrevFrame = CurFrame; } } diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index 9c87b07f2..1e748a8ad 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -1089,7 +1089,8 @@ Class SWWMWeaponSelect : HUDMessageBase private TextureID GetIcon( Weapon w ) { - return StatusBar.GetInventoryIcon(w,StatusBar.DI_SKIPALTICON|StatusBar.DI_SKIPREADY); + let [ico, applyScale] = StatusBar.GetInventoryIcon(w,StatusBar.DI_SKIPALTICON|StatusBar.DI_SKIPREADY); + return ico; } private double CalcHeight()