OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Revert "Localize Mortal Rifle popups."

Browse source 
This reverts commit a475af5e8b.

Due to the font used, these are not serializable.
This commit is contained in:
Mari the Deer 2022-09-14 21:43:16 +02:00
commit 64156a9fcf
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/dlc1/swwm_dlcweapons_canvas.zsc
View file

@ -221,11 +221,8 @@ extend Class MisterRifle
str = StringTable.Localize("$SWWM_MRLOW");
fw = MortalFontMed.StringWidth(str);
fh = MortalFontMed.GetHeight();
double scl = min(1.,224./fw);
fw = int(fw*scl);
fh = int(fh*scl);
DrawWindowFrame(128-fw/2,72-fh/2,fw,fh,2,-2,true);
TouchScreen.DrawText(MortalFontMed,Font.FindFontColor("MiniBrass"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%8>=4)?0x80000000:0x000000,DTA_ScaleX,scl,DTA_ScaleY,scl);
TouchScreen.DrawText(MortalFontMed,Font.FindFontColor("MiniBrass"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%8>=4)?0x80000000:0x000000);
}
if ( noammotic && (noammotic > gametic) )
{
@ -233,11 +230,8 @@ extend Class MisterRifle
str = StringTable.Localize("$SWWM_MRNONE");
fw = MortalFontBig.StringWidth(str);
fh = MortalFontBig.GetHeight();
double scl = min(1.,224./fw);
fw = int(fw*scl);
fh = int(fh*scl);
DrawWindowFrame(128-fw/2,72-fh/2,fw,fh,4,-4,true);
TouchScreen.DrawText(MortalFontBig,Font.FindFontColor("MiniRed"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%16>=8)?0x80000000:0x000000,DTA_ScaleX,scl,DTA_ScaleY,scl);
TouchScreen.DrawText(MortalFontBig,Font.FindFontColor("MiniRed"),128-fw/2,72-fh/2,str,DTA_ColorOverlay,(gametic%16>=8)?0x80000000:0x000000);
}
// Holo sub-screen
if ( !AmmoLed ) AmmoLed = TexMan.GetCanvas("MORTLED2");