zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: The changemap CCMD did not work for maps not defined by MAPINFO. 

SVN r4131 (trunk)
This commit is contained in:
Randy Heit 2013-02-12 23:55:28 +00:00
parent 62b23901eb
commit 0b9b6dda2e
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/g_level.cpp
View File

@ -489,7 +489,7 @@ void G_ChangeLevel(const char *levelname, int position, int flags, int nextSkill
} }
else if (strncmp(levelname, "enDSeQ", 6) != 0) else if (strncmp(levelname, "enDSeQ", 6) != 0)
{ {
nextinfo = FindLevelInfo (levelname); nextinfo = FindLevelInfo (levelname, false);
if (nextinfo != NULL) if (nextinfo != NULL)
{ {
level_info_t *nextredir = nextinfo->CheckLevelRedirect(); level_info_t *nextredir = nextinfo->CheckLevelRedirect();
@ -655,17 +655,14 @@ void G_DoCompleted (void)
} }
else else
{ {
if (strncmp (nextlevel, "enDSeQ", 6) == 0) level_info_t *nextinfo = FindLevelInfo (nextlevel, false);
if (nextinfo == NULL || strncmp (nextlevel, "enDSeQ", 6) == 0)
{ {
wminfo.next = nextlevel; wminfo.next = nextlevel;
wminfo.LName1 = NULL; wminfo.LName1 = NULL;
} }
else else
{ {
level_info_t *nextinfo = FindLevelInfo (nextlevel);
wminfo.next = nextinfo->mapname; wminfo.next = nextinfo->mapname;
wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->pname, FTexture::TEX_MiscPatch)]; wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->pname, FTexture::TEX_MiscPatch)];
} }

2
src/g_level.h
View File

@ -515,7 +515,7 @@ void G_InitLevelLocals (void);
void G_AirControlChanged (); void G_AirControlChanged ();
cluster_info_t *FindClusterInfo (int cluster); cluster_info_t *FindClusterInfo (int cluster);
level_info_t *FindLevelInfo (const char *mapname); level_info_t *FindLevelInfo (const char *mapname, bool allowdefault=true);
level_info_t *FindLevelByNum (int num); level_info_t *FindLevelByNum (int num);
level_info_t *CheckLevelRedirect (level_info_t *info); level_info_t *CheckLevelRedirect (level_info_t *info);

5
src/g_mapinfo.cpp
View File

@ -82,7 +82,7 @@ static int FindWadLevelInfo (const char *name)
// //
//========================================================================== //==========================================================================
level_info_t *FindLevelInfo (const char *mapname) level_info_t *FindLevelInfo (const char *mapname, bool allowdefault)
{ {
int i; int i;
@ -90,7 +90,7 @@ level_info_t *FindLevelInfo (const char *mapname)
{ {
return &wadlevelinfos[i]; return &wadlevelinfos[i];
} }
else else if (allowdefault)
{ {
if (TheDefaultLevelInfo.LevelName.IsEmpty()) if (TheDefaultLevelInfo.LevelName.IsEmpty())
{ {
@ -100,6 +100,7 @@ level_info_t *FindLevelInfo (const char *mapname)
} }
return &TheDefaultLevelInfo; return &TheDefaultLevelInfo;
} }
return NULL;
} }
//========================================================================== //==========================================================================