zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: the direct native GetTextureSize used the wrong calling convention.

This commit is contained in:
Christoph Oelckers 2018-11-30 19:28:24 +01:00
parent 8e46cb3a21
commit 62f649b4f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/textures/texturemanager.cpp
View File

@ -1417,7 +1417,7 @@ DEFINE_ACTION_FUNCTION(_TexMan, GetName)
//
//==========================================================================
static void GetTextureSize(int texid, int *px, int *py)
static int GetTextureSize(int texid, int *py)
{
auto tex = TexMan.ByIndex(texid);
int x, y;
@ -1427,8 +1427,8 @@ static void GetTextureSize(int texid, int *px, int *py)
y = tex->GetHeight();
}
else x = y = -1;
if (px) *px = x;
if (py) *py = y;
return x;
}
DEFINE_ACTION_FUNCTION_NATIVE(_TexMan, GetSize, GetTextureSize)
@ -1436,7 +1436,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_TexMan, GetSize, GetTextureSize)
PARAM_PROLOGUE;
PARAM_INT(texid);
int x, y;
GetTextureSize(texid, &x, &y);
x = GetTextureSize(texid, &y);
if (numret > 0) ret[0].SetInt(x);
if (numret > 1) ret[1].SetInt(y);
return MIN(numret, 2);