zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 06:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The MAPINFO keyword resetinventory only worked when traveling to a redirected map.

Browse source 
SVN r2108 (trunk)
This commit is contained in:
Randy Heit 2010-01-08 03:40:10 +00:00
parent 7df898c88e
commit 8de8924c47
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/g_level.cpp
View file

@ -570,18 +570,24 @@ void G_ChangeLevel(const char *levelname, int position, bool keepFacing, int nex
return; return;
} }
nextlevel = levelname; if (strncmp(levelname, "enDSeQ", 6) != 0)
if (strncmp(levelname, "enDSeQ", 6))
{ {
nextinfo = FindLevelInfo (nextlevel)->CheckLevelRedirect (); nextinfo = FindLevelInfo (nextlevel);
if (nextinfo) if (nextinfo != NULL)
{ {
nextlevel = nextinfo->mapname; level_info_t *nextredir = nextinfo->CheckLevelRedirect();
if (nextredir != NULL)
{
nextinfo = nextredir;
levelname = nextinfo->mapname;
}
} }
} }
if (nextSkill != -1) NextSkill = nextSkill; nextlevel = levelname;
if (nextSkill != -1)
NextSkill = nextSkill;
g_nomonsters = nomonsters; g_nomonsters = nomonsters;

2
src/g_mapinfo.cpp
View file

@ -85,7 +85,9 @@ level_info_t *FindLevelInfo (const char *mapname)
int i; int i;
if ((i = FindWadLevelInfo (mapname)) > -1) if ((i = FindWadLevelInfo (mapname)) > -1)
{
return &wadlevelinfos[i]; return &wadlevelinfos[i];
}
else else
{ {
if (TheDefaultLevelInfo.LevelName.IsEmpty()) if (TheDefaultLevelInfo.LevelName.IsEmpty())