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

Fix skipping to the end of def blocks

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7938 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-08-09 09:41:05 +00:00 committed by Christoph Oelckers
parent 36366c0c98
commit e7723efcf4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/build/src/defs.cpp
View file

@ -2701,7 +2701,7 @@ static int32_t defsparser(scriptfile *script)
if (tile != DEFAULTPSKY && (unsigned)tile >= MAXUSERTILES) if (tile != DEFAULTPSKY && (unsigned)tile >= MAXUSERTILES)
{ {
script->textptr = blockend; script->textptr = blockend+1;
break; break;
} }
@ -2789,7 +2789,7 @@ static int32_t defsparser(scriptfile *script)
{ {
initprintf("Error: basepalette: Invalid basepal number on line %s:%d\n", initprintf("Error: basepalette: Invalid basepal number on line %s:%d\n",
script->filename, scriptfile_getlinum(script,cmdtokptr)); script->filename, scriptfile_getlinum(script,cmdtokptr));
script->textptr = blockend; script->textptr = blockend+1;
break; break;
} }
@ -2976,7 +2976,7 @@ static int32_t defsparser(scriptfile *script)
{ {
initprintf("Error: palookup: Invalid pal number on line %s:%d\n", initprintf("Error: palookup: Invalid pal number on line %s:%d\n",
script->filename, scriptfile_getlinum(script,cmdtokptr)); script->filename, scriptfile_getlinum(script,cmdtokptr));
script->textptr = blockend; script->textptr = blockend+1;
break; break;
} }
@ -3283,7 +3283,7 @@ static int32_t defsparser(scriptfile *script)
{ {
initprintf("Error: blendtable: Invalid blendtable number on line %s:%d\n", initprintf("Error: blendtable: Invalid blendtable number on line %s:%d\n",
script->filename, scriptfile_getlinum(script,cmdtokptr)); script->filename, scriptfile_getlinum(script,cmdtokptr));
script->textptr = blockend; script->textptr = blockend+1;
break; break;
} }
@ -3651,7 +3651,7 @@ static int32_t defsparser(scriptfile *script)
char *blockend; char *blockend;
if (scriptfile_getbraces(script,&blockend)) if (scriptfile_getbraces(script,&blockend))
break; break;
script->textptr = blockend; script->textptr = blockend+1;
break; break;
} }

10
source/duke3d/src/game.cpp
View file

@ -5494,7 +5494,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
} }
} }
else else
pScript->textptr = animEnd; pScript->textptr = animEnd+1;
} }
break; break;
case T_ANIMSOUNDS: case T_ANIMSOUNDS:
@ -5513,7 +5513,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
if (firstPass) if (firstPass)
{ {
pScript->textptr = animSoundsEnd; pScript->textptr = animSoundsEnd+1;
break; break;
} }
@ -5588,7 +5588,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
break; break;
if (firstPass) if (firstPass)
{ {
pScript->textptr = newGameChoicesEnd; pScript->textptr = newGameChoicesEnd+1;
break; break;
} }
@ -5610,7 +5610,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
{ {
initprintf("Error: Maximum choices exceeded near line %s:%d\n", initprintf("Error: Maximum choices exceeded near line %s:%d\n",
pScript->filename, scriptfile_getlinum(pScript, choicePtr)); pScript->filename, scriptfile_getlinum(pScript, choicePtr));
pScript->textptr = choiceEnd; pScript->textptr = choiceEnd+1;
} }
MenuGameplayStemEntry & stem = g_MenuGameplayEntries[choiceID]; MenuGameplayStemEntry & stem = g_MenuGameplayEntries[choiceID];
@ -5635,7 +5635,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
{ {
initprintf("Error: Maximum subchoices exceeded near line %s:%d\n", initprintf("Error: Maximum subchoices exceeded near line %s:%d\n",
pScript->filename, scriptfile_getlinum(pScript, subChoicePtr)); pScript->filename, scriptfile_getlinum(pScript, subChoicePtr));
pScript->textptr = subChoiceEnd; pScript->textptr = subChoiceEnd+1;
} }
MenuGameplayEntry & subentry = stem.subentries[subChoiceID]; MenuGameplayEntry & subentry = stem.subentries[subChoiceID];