- redirected maps need to be defined in order to redirect

ZDoom · Feb 4, 2023 · 4ac76d8 · 4ac76d8
1 parent b50d7f4
commit 4ac76d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/g_level.cpp b/src/g_level.cpp
@@ -562,8 +562,8 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
 		auto redirectmap = FindLevelInfo(mapname);
 		if (redirectmap->RedirectCVAR != NAME_None)
 			redirectmap = redirectmap->CheckLevelRedirect();
-		if (redirectmap)
-			mapname = redirectmap->MapName;
+		if (redirectmap && redirectmap->MapName.GetChars()[0])
+				mapname = redirectmap->MapName;
 	}
 
 	G_VerifySkill();

diff --git a/src/gamedata/g_mapinfo.cpp b/src/gamedata/g_mapinfo.cpp
@@ -403,12 +403,14 @@ level_info_t *level_info_t::CheckLevelRedirect ()
 					if (playeringame[i] && (var = GetCVar(i, RedirectCVAR.GetChars())))
 					{
 						if (var->ToInt())
-							return FindLevelInfo(RedirectCVARMapName);
+							if (P_CheckMapData(RedirectCVARMapName))
+								return FindLevelInfo(RedirectCVARMapName);
 					}
 				}
 			}
 			else if (var->ToInt())
-				return FindLevelInfo(RedirectCVARMapName);
+				if (P_CheckMapData(RedirectCVARMapName))
+					return FindLevelInfo(RedirectCVARMapName);
 		}
 	}
 	return NULL;