From e7723efcf4f2c724f5e467b31e140dc90a22a593 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 9 Aug 2019 09:41:05 +0000 Subject: [PATCH] Fix skipping to the end of def blocks git-svn-id: https://svn.eduke32.com/eduke32@7938 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/defs.cpp | 10 +++++----- source/duke3d/src/game.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/build/src/defs.cpp b/source/build/src/defs.cpp index 42f01fda7..d28acb808 100644 --- a/source/build/src/defs.cpp +++ b/source/build/src/defs.cpp @@ -2701,7 +2701,7 @@ static int32_t defsparser(scriptfile *script) if (tile != DEFAULTPSKY && (unsigned)tile >= MAXUSERTILES) { - script->textptr = blockend; + script->textptr = blockend+1; break; } @@ -2789,7 +2789,7 @@ static int32_t defsparser(scriptfile *script) { initprintf("Error: basepalette: Invalid basepal number on line %s:%d\n", script->filename, scriptfile_getlinum(script,cmdtokptr)); - script->textptr = blockend; + script->textptr = blockend+1; break; } @@ -2976,7 +2976,7 @@ static int32_t defsparser(scriptfile *script) { initprintf("Error: palookup: Invalid pal number on line %s:%d\n", script->filename, scriptfile_getlinum(script,cmdtokptr)); - script->textptr = blockend; + script->textptr = blockend+1; break; } @@ -3283,7 +3283,7 @@ static int32_t defsparser(scriptfile *script) { initprintf("Error: blendtable: Invalid blendtable number on line %s:%d\n", script->filename, scriptfile_getlinum(script,cmdtokptr)); - script->textptr = blockend; + script->textptr = blockend+1; break; } @@ -3651,7 +3651,7 @@ static int32_t defsparser(scriptfile *script) char *blockend; if (scriptfile_getbraces(script,&blockend)) break; - script->textptr = blockend; + script->textptr = blockend+1; break; } diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 968ebf094..44e1ba8af 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -5494,7 +5494,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass) } } else - pScript->textptr = animEnd; + pScript->textptr = animEnd+1; } break; case T_ANIMSOUNDS: @@ -5513,7 +5513,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass) if (firstPass) { - pScript->textptr = animSoundsEnd; + pScript->textptr = animSoundsEnd+1; break; } @@ -5588,7 +5588,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass) break; if (firstPass) { - pScript->textptr = newGameChoicesEnd; + pScript->textptr = newGameChoicesEnd+1; break; } @@ -5610,7 +5610,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass) { initprintf("Error: Maximum choices exceeded near line %s:%d\n", pScript->filename, scriptfile_getlinum(pScript, choicePtr)); - pScript->textptr = choiceEnd; + pScript->textptr = choiceEnd+1; } 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", pScript->filename, scriptfile_getlinum(pScript, subChoicePtr)); - pScript->textptr = subChoiceEnd; + pScript->textptr = subChoiceEnd+1; } MenuGameplayEntry & subentry = stem.subentries[subChoiceID];