zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 17:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Capitalise vec2_t y variable.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-22 20:28:51 +11:00 • committed by Christoph Oelckers
parent 3c9cd926ba
commit 118ceb18ca
46 changed files with 352 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/core/gamecontrol.cpp
View file

@ -236,8 +236,8 @@ static bool System_DisableTextureFilter()
static IntRect System_GetSceneRect()
{
int viewbottom = windowxy2.y + 1;
int viewheight = viewbottom - windowxy1.y;
int viewbottom = windowxy2.Y + 1;
int viewheight = viewbottom - windowxy1.Y;
int viewright = windowxy2.X + 1;
int viewwidth = viewright - windowxy1.X;
@ -248,7 +248,7 @@ static IntRect System_GetSceneRect()
IntRect mSceneViewport;
mSceneViewport.left = windowxy1.X;
mSceneViewport.top = screen->GetHeight() - (renderheight + windowxy1.y - ((renderheight - viewheight) / 2));
mSceneViewport.top = screen->GetHeight() - (renderheight + windowxy1.Y - ((renderheight - viewheight) / 2));
mSceneViewport.width = viewwidth;
mSceneViewport.height = renderheight;
return mSceneViewport;
@ -1411,7 +1411,7 @@ void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double
double crosshair_scale = crosshairscale * scale;
DrawTexture(twod, tile, 160 + xdelta, 100 + ydelta, DTA_Color, color,
DTA_FullscreenScale, FSMode_Fit320x200, DTA_ScaleX, crosshair_scale, DTA_ScaleY, crosshair_scale, DTA_CenterOffsetRel, true,
DTA_ViewportX, windowxy1.X, DTA_ViewportY, windowxy1.y, DTA_ViewportWidth, windowxy2.X - windowxy1.X + 1, DTA_ViewportHeight, windowxy2.y - windowxy1.y + 1, TAG_DONE);
DTA_ViewportX, windowxy1.X, DTA_ViewportY, windowxy1.Y, DTA_ViewportWidth, windowxy2.X - windowxy1.X + 1, DTA_ViewportHeight, windowxy2.Y - windowxy1.Y + 1, TAG_DONE);
return;
}
@ -1419,8 +1419,8 @@ void DrawCrosshair(int deftile, int health, double xdelta, double ydelta, double
// 0 means 'game provided crosshair' - use type 2 as fallback.
ST_LoadCrosshair(crosshair == 0 ? 2 : *crosshair, false);
double xpos = (windowxy1.X + windowxy2.X) / 2 + xdelta * (windowxy2.y - windowxy1.y) / 240.;
double ypos = (windowxy1.y + windowxy2.y) / 2;
double xpos = (windowxy1.X + windowxy2.X) / 2 + xdelta * (windowxy2.Y - windowxy1.Y) / 240.;
double ypos = (windowxy1.Y + windowxy2.Y) / 2;
ST_DrawCrosshair(health, xpos, ypos, 1);
}
}
@ -1525,9 +1525,9 @@ DEFINE_ACTION_FUNCTION(_Screen, GetViewWindow)
{
PARAM_PROLOGUE;
if (numret > 0) ret[0].SetInt(windowxy1.X);
if (numret > 1) ret[1].SetInt(windowxy1.y);
if (numret > 1) ret[1].SetInt(windowxy1.Y);
if (numret > 2) ret[2].SetInt(windowxy2.X - windowxy1.X + 1);
if (numret > 3) ret[3].SetInt(windowxy2.y - windowxy1.y + 1);
if (numret > 3) ret[3].SetInt(windowxy2.Y - windowxy1.Y + 1);
return min(numret, 4);
}