zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-17 01:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- redirected maps need to be defined in order to redirect

Browse source
This commit is contained in:
Rachael Alexanderson 2023-02-03 20:21:40 -05:00
parent b50d7f4db5
commit 4ac76d82d8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_level.cpp
View file

@ -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();

6
src/gamedata/g_mapinfo.cpp
View file

@ -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;