zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Christoph Oelckers 2018-01-20 22:41:41 +01:00
commit 9b40097e48
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/v_draw.cpp
View file

@ -230,6 +230,15 @@ DEFINE_ACTION_FUNCTION(_Screen, GetClipRect)
return MIN(numret, 4); return MIN(numret, 4);
} }
DEFINE_ACTION_FUNCTION(_Screen, GetViewWindow)
{
PARAM_PROLOGUE;
if (numret > 0) ret[0].SetInt(viewwindowx);
if (numret > 1) ret[1].SetInt(viewwindowy);
if (numret > 2) ret[2].SetInt(viewwidth);
if (numret > 3) ret[3].SetInt(viewheight);
return MIN(numret, 4);
}
bool DCanvas::SetTextureParms(DrawParms *parms, FTexture *img, double xx, double yy) const bool DCanvas::SetTextureParms(DrawParms *parms, FTexture *img, double xx, double yy) const
{ {

1
wadsrc/static/zscript/base.txt
View file

@ -175,6 +175,7 @@ struct Screen native
native static void SetClipRect(int x, int y, int w, int h); native static void SetClipRect(int x, int y, int w, int h);
native static void ClearClipRect(); native static void ClearClipRect();
native static int, int, int, int GetClipRect(); native static int, int, int, int GetClipRect();
native static int, int, int, int GetViewWindow();
// This is a leftover of the abandoned Inventory.DrawPowerup method. // This is a leftover of the abandoned Inventory.DrawPowerup method.