OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2015-05-04 09:29:46 +02:00
commit 8c5cc45dbe
4 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/g_mapinfo.cpp
View file

@ -312,8 +312,13 @@ FString level_info_t::LookupLevelName()
{
mysnprintf (checkstring, countof(checkstring), "%d: ", atoi(&MapName[5]));
}
else
{
// make sure nothing is stripped.
checkstring[0] = '\0';
}
thename = strstr (lookedup, checkstring);
if (thename == NULL)
if (thename == NULL || thename == lookedup)
{
thename = lookedup;
}