zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

In 'tilefromtexture' DEF token, fix specifying -1 xoffset or yoffset.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4402 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-03-29 21:48:44 +00:00
parent da0c6d00ca
commit 5d2ef07986
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
polymer/eduke32/build/src/defs.c
View file

@ -548,7 +548,8 @@ static int32_t defsparser(scriptfile *script)
char *texturetokptr = script->ltextptr, *textureend, *fn = NULL; char *texturetokptr = script->ltextptr, *textureend, *fn = NULL;
int32_t tile = -1; int32_t tile = -1;
int32_t alphacut = 255, flags = 0; int32_t alphacut = 255, flags = 0;
int32_t xoffset = ~0, yoffset = ~0; int32_t havexoffset = 0, haveyoffset = 0;
int32_t xoffset = 0, yoffset = 0;
static const tokenlist tilefromtexturetokens[] = static const tokenlist tilefromtexturetokens[] =
{ {
@ -575,8 +576,10 @@ static int32_t defsparser(scriptfile *script)
case T_ALPHACUT: case T_ALPHACUT:
scriptfile_getsymbol(script,&alphacut); break; scriptfile_getsymbol(script,&alphacut); break;
case T_XOFFSET: case T_XOFFSET:
havexoffset = 1;
scriptfile_getsymbol(script,&xoffset); break; scriptfile_getsymbol(script,&xoffset); break;
case T_YOFFSET: case T_YOFFSET:
haveyoffset = 1;
scriptfile_getsymbol(script,&yoffset); break; scriptfile_getsymbol(script,&yoffset); break;
case T_TEXHITSCAN: case T_TEXHITSCAN:
flags |= PICANM_TEXHITSCAN_BIT; flags |= PICANM_TEXHITSCAN_BIT;
@ -600,12 +603,12 @@ static int32_t defsparser(scriptfile *script)
{ {
// tilefromtexture <tile> { texhitscan } sets the bit but doesn't change tile data // tilefromtexture <tile> { texhitscan } sets the bit but doesn't change tile data
picanm[tile].sf |= flags; picanm[tile].sf |= flags;
if (xoffset != ~0) if (havexoffset)
picanm[tile].xofs = clamp(xoffset, -128, 127); picanm[tile].xofs = clamp(xoffset, -128, 127);
if (yoffset != ~0) if (haveyoffset)
picanm[tile].yofs = clamp(yoffset, -128, 127); picanm[tile].yofs = clamp(yoffset, -128, 127);
if (flags == 0 && xoffset == ~0 && yoffset == ~0) if (flags == 0 && !havexoffset && !haveyoffset)
initprintf("\nError: missing 'file name' for tilefromtexture definition near line %s:%d", initprintf("\nError: missing 'file name' for tilefromtexture definition near line %s:%d",
script->filename, scriptfile_getlinum(script,texturetokptr)); script->filename, scriptfile_getlinum(script,texturetokptr));
break; break;
@ -630,8 +633,8 @@ static int32_t defsparser(scriptfile *script)
break; break;
set_tilesiz(tile, xsiz, ysiz); set_tilesiz(tile, xsiz, ysiz);
picanm[tile].xofs = (xoffset == ~0) ? 0 : clamp(xoffset, -128, 127); picanm[tile].xofs = havexoffset ? clamp(xoffset, -128, 127) : 0;
picanm[tile].yofs = (yoffset == ~0) ? 0 : clamp(yoffset, -128, 127); picanm[tile].yofs = haveyoffset ? clamp(yoffset, -128, 127) : 0;
picanm[tile].sf |= flags; picanm[tile].sf |= flags;
tile_from_truecolpic(tile, picptr, alphacut); tile_from_truecolpic(tile, picptr, alphacut);