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

Defs: Add "undefinetile" and "undefinetilerange".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5127 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-04-09 07:52:28 +00:00
parent e6f429e2ab
commit 1ab930ea28
1 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,6 +85,7 @@ enum scripttoken_t
T_LOADGRP, T_LOADGRP,
T_DUMMYTILE,T_DUMMYTILERANGE, T_DUMMYTILE,T_DUMMYTILERANGE,
T_SETUPTILE,T_SETUPTILERANGE, T_SETUPTILE,T_SETUPTILERANGE,
T_UNDEFINETILE,T_UNDEFINETILERANGE,
T_ANIMTILERANGE, T_ANIMTILERANGE,
T_CACHESIZE, T_CACHESIZE,
T_IMPORTTILE, T_IMPORTTILE,
@ -217,6 +218,19 @@ static void tile_from_truecolpic(int32_t tile, const palette_t *picptr, int32_t
} }
} }
static void undefinetile(int32_t tile)
{
tilesiz[tile].x = 0;
tilesiz[tile].y = 0;
picsiz[tile] = 0;
// CACHE1D_FREE
walock[tile] = 1;
waloff[tile] = 0;
DO_FREE_AND_NULL(faketiledata[tile]);
faketile[tile>>3] &= ~pow2char[tile&7];
Bmemset(&picanm[tile], 0, sizeof(picanm_t));
}
#undef USE_DEF_PROGRESS #undef USE_DEF_PROGRESS
#if defined _WIN32 || defined HAVE_GTK2 #if defined _WIN32 || defined HAVE_GTK2
# define USE_DEF_PROGRESS # define USE_DEF_PROGRESS
@ -283,6 +297,8 @@ static int32_t defsparser(scriptfile *script)
{ "dummytilerange", T_DUMMYTILERANGE }, { "dummytilerange", T_DUMMYTILERANGE },
{ "setuptile", T_SETUPTILE }, { "setuptile", T_SETUPTILE },
{ "setuptilerange", T_SETUPTILERANGE }, { "setuptilerange", T_SETUPTILERANGE },
{ "undefinetile", T_UNDEFINETILE },
{ "undefinetilrange",T_UNDEFINETILERANGE },
{ "animtilerange", T_ANIMTILERANGE }, { "animtilerange", T_ANIMTILERANGE },
{ "cachesize", T_CACHESIZE }, { "cachesize", T_CACHESIZE },
{ "dummytilefrompic",T_IMPORTTILE }, { "dummytilefrompic",T_IMPORTTILE },
@ -725,6 +741,14 @@ static int32_t defsparser(scriptfile *script)
if (scriptfile_getsymbol(script,&xsiz)) break; if (scriptfile_getsymbol(script,&xsiz)) break;
if (scriptfile_getsymbol(script,&ysiz)) break; if (scriptfile_getsymbol(script,&ysiz)) break;
if ((unsigned)tile >= (unsigned)MAXUSERTILES) break;
if ((int16_t) xsiz == 0 || (int16_t) ysiz == 0)
{
undefinetile(tile);
break;
}
if (xsiz > 0 && ysiz > 0) if (xsiz > 0 && ysiz > 0)
{ {
set_tilesiz(tile, xsiz, ysiz); set_tilesiz(tile, xsiz, ysiz);
@ -746,9 +770,16 @@ static int32_t defsparser(scriptfile *script)
if (check_tile_range("dummytilerange", &tile1, &tile2, script, cmdtokptr)) if (check_tile_range("dummytilerange", &tile1, &tile2, script, cmdtokptr))
break; break;
if (xsiz <= 0 || ysiz <= 0) if (xsiz < 0 || ysiz < 0)
break; // TODO: message break; // TODO: message
if ((int16_t) xsiz == 0 || (int16_t) ysiz == 0)
{
for (i=tile1; i<=tile2; i++)
undefinetile(i);
break;
}
for (i=tile1; i<=tile2; i++) for (i=tile1; i<=tile2; i++)
{ {
set_tilesiz(i, xsiz, ysiz); set_tilesiz(i, xsiz, ysiz);
@ -759,6 +790,34 @@ static int32_t defsparser(scriptfile *script)
break; break;
} }
case T_UNDEFINETILE:
{
int32_t tile;
if (scriptfile_getsymbol(script,&tile)) break;
if ((unsigned)tile >= (unsigned)MAXUSERTILES) break;
undefinetile(tile);
break;
}
case T_UNDEFINETILERANGE:
{
int32_t tile1, tile2;
if (scriptfile_getnumber(script,&tile1)) break;
if (scriptfile_getnumber(script,&tile2)) break;
if (check_tile_range("undefinetilerange", &tile1, &tile2, script, cmdtokptr))
break;
for (int32_t i = tile1; i <= tile2; i++)
undefinetile(i);
break;
}
case T_DEFINEMODEL: case T_DEFINEMODEL:
{ {
char *modelfn; char *modelfn;