zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-18 23:52:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- silenced a few float truncation warnings that get printed in developer mode.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-27 10:23:31 +02:00
parent 22b70dd222
commit c3f9b4a5ee
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wadsrc/static/zscript/menu/optionmenuitems.txt
View file

@ -1244,7 +1244,7 @@ class OptionMenuItemScaleSlider : OptionMenuItemSlider
{ {
drawLabel(indent, y, selected? OptionMenuSettings.mFontColorSelection : OptionMenuSettings.mFontColor); drawLabel(indent, y, selected? OptionMenuSettings.mFontColorSelection : OptionMenuSettings.mFontColor);
int Selection = GetSliderValue(); int Selection = int(GetSliderValue());
if ((Selection == 0 || Selection == -1) && mClickVal <= 0) if ((Selection == 0 || Selection == -1) && mClickVal <= 0)
{ {
String text = Selection == 0? TextZero : Selection == -1? TextNegOne : ""; String text = Selection == 0? TextZero : Selection == -1? TextNegOne : "";
@ -1260,7 +1260,7 @@ class OptionMenuItemScaleSlider : OptionMenuItemSlider
override bool MouseEvent(int type, int x, int y) override bool MouseEvent(int type, int x, int y)
{ {
int value = GetSliderValue(); int value = int(GetSliderValue());
switch (type) switch (type)
{ {
case Menu.MOUSE_Click: case Menu.MOUSE_Click:

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

@ -192,7 +192,7 @@ class StatusScreen abstract play version("2.5")
{ {
let size = TexMan.GetScaledSize(pinfo.mPatch); let size = TexMan.GetScaledSize(pinfo.mPatch);
screen.DrawTexture(pinfo.mPatch, true, midx - size.X * CleanXfac/2, y, DTA_CleanNoMove, true); screen.DrawTexture(pinfo.mPatch, true, midx - size.X * CleanXfac/2, y, DTA_CleanNoMove, true);
return y + (size.Y * CleanYfac); return y + int(size.Y * CleanYfac);
} }
else else
{ {

2
wadsrc/static/zscript/statscreen/statscreen_coop.txt
View file

@ -221,7 +221,7 @@ class CoopStatusScreen : StatusScreen
// Use the readyico height if it's bigger. // Use the readyico height if it's bigger.
Vector2 readysize = TexMan.GetScaledSize(readyico); Vector2 readysize = TexMan.GetScaledSize(readyico);
Vector2 readyoffset = TexMan.GetScaledOffset(readyico); Vector2 readyoffset = TexMan.GetScaledOffset(readyico);
height = readysize.Y - readyoffset.Y; height = int(readysize.Y - readyoffset.Y);
maxiconheight = MAX(height, maxiconheight); maxiconheight = MAX(height, maxiconheight);
height = SmallFont.GetHeight() * CleanYfac; height = SmallFont.GetHeight() * CleanYfac;
lineheight = MAX(height, maxiconheight * CleanYfac); lineheight = MAX(height, maxiconheight * CleanYfac);

2
wadsrc/static/zscript/statscreen/statscreen_dm.txt
View file

@ -158,7 +158,7 @@ class DeathmatchStatusScreen : StatusScreen
// Use the readyico height if it's bigger. // Use the readyico height if it's bigger.
Vector2 readysize = TexMan.GetScaledSize(readyico); Vector2 readysize = TexMan.GetScaledSize(readyico);
Vector2 readyoffset = TexMan.GetScaledOffset(readyico); Vector2 readyoffset = TexMan.GetScaledOffset(readyico);
height = readysize.Y - readyoffset.Y; height = int(readysize.Y - readyoffset.Y);
maxiconheight = MAX(height, maxiconheight); maxiconheight = MAX(height, maxiconheight);
height = SmallFont.GetHeight() * CleanYfac; height = SmallFont.GetHeight() * CleanYfac;
lineheight = MAX(height, maxiconheight * CleanYfac); lineheight = MAX(height, maxiconheight * CleanYfac);

4
wadsrc/static/zscript/statusbar/statusbar.txt
View file

@ -774,9 +774,9 @@ class BaseStatusBar native ui
} }
String mapname = level.FormatMapName(crdefault); String mapname = level.FormatMapName(crdefault);
BrokenLines lines = SmallFont.BreakLines(mapname, SCREENWIDTH / scale.X); BrokenLines lines = SmallFont.BreakLines(mapname, int(SCREENWIDTH / scale.X));
int numlines = lines.Count(); int numlines = lines.Count();
int finalwidth = SmallFont.StringWidth(lines.StringAt(numlines-1)) * scale.X; int finalwidth = int(SmallFont.StringWidth(lines.StringAt(numlines-1)) * scale.X);
// calculate the top of the statusbar including any protrusion and transform it from status bar to screen space. // calculate the top of the statusbar including any protrusion and transform it from status bar to screen space.
double tmp, hres; double tmp, hres;

2
wadsrc/static/zscript/statusbar/strife_sbar.txt
View file

@ -266,7 +266,7 @@ class StrifeStatusBar : BaseStatusBar
{ {
double tmp, h; double tmp, h;
[tmp, tmp, h] = StatusbarToRealCoords(0, 0, 8); [tmp, tmp, h] = StatusbarToRealCoords(0, 0, 8);
DrawPopScreen (GetTopOfStatusBar() - h, TicFrac); DrawPopScreen (int(GetTopOfStatusBar() - h), TicFrac);
} }
DrawImage("INVBACK", (0, 168), DI_ITEM_OFFSETS); DrawImage("INVBACK", (0, 168), DI_ITEM_OFFSETS);