diff --git a/language.version b/language.version index c89e05fa5..e6cff2f32 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.7 \cu(Mon 4 Apr 14:26:12 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.2.7 \cu(2022-04-04 14:26:12)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.7 \cu(Mon 4 Apr 14:34:59 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.2.7 \cu(2022-04-04 14:34:59)\c-"; diff --git a/zscript/menu/swwm_title.zsc b/zscript/menu/swwm_title.zsc index f7ab7092b..09faac160 100644 --- a/zscript/menu/swwm_title.zsc +++ b/zscript/menu/swwm_title.zsc @@ -318,11 +318,11 @@ Class SWWMTitleStuff : EventHandler Screen.DrawTexture(tex[4],false,(vsize.x-tsize.x)/2,(vsize.y-tsize.y)/2,DTA_VirtualWidthF,vsize.x,DTA_VirtualHeightF,vsize.y,DTA_KeepRatio,true,DTA_Alpha,alf); } double scl = Screen.GetHeight()/vsize.y; - double tscl1 = max(1./3.,(floor((Screen.GetHeight()*3.)/vsize.y)+4.)/3.); + double tscl1 = max(.5,(floor((Screen.GetHeight()*4.)/vsize.y)+3.)/2.); str = "CODENAME"; alf = clamp(((titletimer+e.FracTic)/GameTicRate)-22,0.,1.); - Screen.DrawText(BigFont,Font.CR_SAPPHIRE,(Screen.GetWidth()-tscl1*BigFont.StringWidth(str))/2,(Screen.GetHeight()-(scl*400+BigFont.GetHeight()*tscl1))/2,str,DTA_ScaleX,tscl1,DTA_ScaleY,tscl1,DTA_Alpha,alf); - double tscl2 = max(1./3.,(floor((Screen.GetHeight()*3.)/vsize.y)+1.)/3.); + Screen.DrawText(BigFont,Font.CR_SAPPHIRE,int(Screen.GetWidth()-tscl1*BigFont.StringWidth(str))/2,int(Screen.GetHeight()-(scl*400+BigFont.GetHeight()*tscl1))/2,str,DTA_ScaleX,tscl1,DTA_ScaleY,tscl1,DTA_Alpha,alf); + double tscl2 = max(.5,floor((Screen.GetHeight()*4.)/vsize.y)/2.); if ( !stitle || (lastlang2 != language) ) { Array done; @@ -354,12 +354,12 @@ Class SWWMTitleStuff : EventHandler lastlang2 = language; alf = clamp(((titletimer+e.FracTic)/GameTicRate)-27,0.,1.); double xx; - double yy = (Screen.GetHeight()+(scl*360+(1.-alf)*80*tscl2))/2; + double yy = int(Screen.GetHeight()+(scl*360+(1.-alf)*80*tscl2))/2; for ( int i=0; i= 23.) && (((titletimer+e.FracTic)/GameTicRate) < 25.6) ) {