OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit '6e45c565a0' into scripting

Browse source 
Conflicts:
	src/p_mobj.cpp

(This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)
This commit is contained in:
Christoph Oelckers 2015-04-28 12:59:20 +02:00
commit ddced06be2
28 changed files with 1672 additions and 1457 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/d_main.cpp
View file

@ -2012,6 +2012,9 @@ static void D_DoomInit()
static void AddAutoloadFiles(const char *group, const char *autoname)
{
LumpFilterGroup = group;
LumpFilterIWAD = autoname;
if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload"))
{
FString file;