UMAPINFO: Fix nextsecret inconsistencies (#497)

coelckers · Apr 25, 2022 · b21bdbc · b21bdbc
1 parent 784a17d
commit b21bdbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/prboom2/src/g_game.c b/prboom2/src/g_game.c
@@ -1844,7 +1844,7 @@ void G_WorldDone (void)
 
 		  return;
 	  }
-	  else if (gamemapinfo->endpic[0] && (strcmp(gamemapinfo->endpic, "-") != 0))
+	  else if (gamemapinfo->endpic[0] && gamemapinfo->endpic[0] != '-' && !secretexit)
 	  {
 		  // game ends without a status screen.
 		  gameaction = ga_victory;

diff --git a/prboom2/src/umapinfo.cpp b/prboom2/src/umapinfo.cpp
@@ -453,7 +453,7 @@ static int ParseStandardProperty(Scanner &scanner, MapEntry *mape)
 		ParseLumpName(scanner, mape->nextsecret);
 		if (!G_ValidateMapName(mape->nextsecret, NULL, NULL))
 		{
-			scanner.ErrorF("Invalid map name %s", mape->nextmap);
+			scanner.ErrorF("Invalid map name %s", mape->nextsecret);
 			return 0;
 		}
 	}
@@ -678,7 +678,7 @@ int ParseUMapInfo(const unsigned char *buffer, size_t length, umapinfo_errorfunc
 		// Set default level progression here to simplify the checks elsewhere. Doing this lets us skip all normal code for this if nothing has been defined.
 		if (parsed.endpic[0] && (strcmp(parsed.endpic, "-") != 0))
 		{
-			parsed.nextmap[0] = parsed.nextsecret[0] = 0;
+			parsed.nextmap[0] = 0;
 		}
 		else if (!parsed.nextmap[0] && !parsed.endpic[0])
 		{