OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
Conflicts:
	dumb/vc6/dumb_static/dumb_static.vcproj
	wadsrc/static/compatibility.txt
This commit is contained in:
Christoph Oelckers 2015-03-15 11:42:59 +01:00
commit 97947f9e10
164 changed files with 12141 additions and 18552 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_level.cpp
View file

@ -901,11 +901,13 @@ void G_DoLoadLevel (int position, bool autosave)
if (level.flags2 & LEVEL2_FORCETEAMPLAYOFF)
teamplay = false;
FString mapname = level.MapName;
mapname.ToLower();
Printf (
"\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36"
"\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n"
TEXTCOLOR_BOLD "%s - %s\n\n",
level.MapName.GetChars(), level.LevelName.GetChars());
mapname.GetChars(), level.LevelName.GetChars());
if (wipegamestate == GS_LEVEL)
wipegamestate = GS_FORCEWIPE;