zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed accidental commit of incomplete test code.

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-20 18:54:29 +01:00
parent 64dc582fbe
commit 74f5211046
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wadsrc/static/zscript/menu/listmenuitems.txt
View file

@ -71,7 +71,7 @@ class ListMenuItemStaticPatch : ListMenuItem
Font mFont; Font mFont;
int mColor; int mColor;
void Init(ListMenuDescriptor desc, double x, double y, TextureID patch, bool centered = false, const char *substitute = "") void Init(ListMenuDescriptor desc, double x, double y, TextureID patch, bool centered = false, String substitute = "")
{ {
Super.Init(x, y); Super.Init(x, y);
mTexture = patch; mTexture = patch;
@ -123,9 +123,9 @@ class ListMenuItemStaticPatch : ListMenuItem
class ListMenuItemStaticPatchCentered : ListMenuItemStaticPatch class ListMenuItemStaticPatchCentered : ListMenuItemStaticPatch
{ {
void Init(double x, double y, TextureID patch) void Init(ListMenuDescriptor desc, double x, double y, TextureID patch)
{ {
Super.Init(x, y, patch, true); Super.Init(desc, x, y, patch, true);
} }
} }

3
wadsrc/static/zscript/statscreen/statscreen.txt
View file

@ -194,7 +194,8 @@ class StatusScreen abstract play version("2.5")
if (pinfo.mPatch.isValid()) if (pinfo.mPatch.isValid())
{ {
screen.DrawTexture(pinfo.mPatch, true, midx, y, DTA_CleanNoMove, true, DTA_CenterXOffset, true); Vector2 size = TexMan.GetScaledSize(pinfo.mPatch);
screen.DrawTexture(pinfo.mPatch, true, midx - size.X, y, DTA_CleanNoMove, true);
return y + int(size.Y * CleanYfac); return y + int(size.Y * CleanYfac);
} }
else else

8
wadsrc/static/zscript/statscreen/statscreen_sp.txt
View file

@ -142,8 +142,8 @@ class DoomStatusScreen : StatusScreen
let tcolor = Font.CR_RED; let tcolor = Font.CR_RED;
// For visual consistency, only use the patches here if all are present. // For visual consistency, only use the patches here if all are present.
bool useGfx = Kills.OkForLocalization() && Items.OkForLocalization() && P_secret.OkForLocalization() && Timepic.OkForLocalization() && bool useGfx = TexMan.OkForLocalization(Kills) && TexMan.OkForLocalization(Items) && TexMan.OkForLocalization(P_secret) && TexMan.OkForLocalization(Timepic) &&
(!wbs.partime || Par.OkForLocalization()); (!wbs.partime || TexMan.OkForLocalization(Par));
Font printFont; Font printFont;
@ -178,7 +178,7 @@ class DoomStatusScreen : StatusScreen
{ // "sucks" { // "sucks"
int x = 160 - SP_TIMEX; int x = 160 - SP_TIMEX;
int y = SP_TIMEY; int y = SP_TIMEY;
if (useGfx && Sucks.OkForLocalization()) if (useGfx && TexMan.OkForLocalization(Sucks))
{ {
let size = TexMan.GetScaledSize(Sucks); let size = TexMan.GetScaledSize(Sucks);
screen.DrawTexture (Sucks, true, x - size.X, y - size.Y - 2, DTA_Clean, true); screen.DrawTexture (Sucks, true, x - size.X, y - size.Y - 2, DTA_Clean, true);
@ -191,7 +191,7 @@ class DoomStatusScreen : StatusScreen
if (wi_showtotaltime) if (wi_showtotaltime)
{ {
drawTimeFont (printFont, 160 - SP_TIMEX, SP_TIMEY + lh, cnt_total_time, true); // no 'sucks' for total time ever! drawTimeFont (printFont, 160 - SP_TIMEX, SP_TIMEY + lh, cnt_total_time);
} }
drawTimeFont (printFont, 320 - SP_TIMEX, SP_TIMEY, cnt_par); drawTimeFont (printFont, 320 - SP_TIMEX, SP_TIMEY, cnt_par);
} }