Defs: Expand use of check_tile().

git-svn-id: https://svn.eduke32.com/eduke32@5137 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-04-12 08:06:51 +00:00
parent 5678b690a2
commit c26149fd1f

View file

@ -531,7 +531,8 @@ static int32_t defsparser(scriptfile *script)
int32_t tile, tmp; int32_t tile, tmp;
if (scriptfile_getsymbol(script,&tile)) break; if (scriptfile_getsymbol(script,&tile)) break;
if ((unsigned)tile >= MAXUSERTILES) break; if (check_tile("setuptile", tile, script, cmdtokptr))
break;
if (scriptfile_getsymbol(script,&tmp)) break; // XXX if (scriptfile_getsymbol(script,&tmp)) break; // XXX
h_xsize[tile] = tmp; h_xsize[tile] = tmp;
if (scriptfile_getsymbol(script,&tmp)) break; if (scriptfile_getsymbol(script,&tmp)) break;
@ -741,7 +742,8 @@ 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 (check_tile("dummytile", tile, script, cmdtokptr))
break;
if ((int16_t) xsiz == 0 || (int16_t) ysiz == 0) if ((int16_t) xsiz == 0 || (int16_t) ysiz == 0)
{ {
@ -796,7 +798,8 @@ static int32_t defsparser(scriptfile *script)
if (scriptfile_getsymbol(script,&tile)) break; if (scriptfile_getsymbol(script,&tile)) break;
if ((unsigned)tile >= (unsigned)MAXUSERTILES) break; if (check_tile("undefinetile", tile, script, cmdtokptr))
break;
undefinetile(tile); undefinetile(tile);