OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into new_level_refactor

Browse source 
# Conflicts:
#	src/c_dispatch.cpp
This commit is contained in:
Christoph Oelckers 2019-01-27 10:26:23 +01:00
commit 22939aade7
9 changed files with 133 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -2579,7 +2579,7 @@ void D_DoomMain (void)
// [RH] Run any saved commands from the command line or autoexec.cfg now.
gamestate = GS_FULLCONSOLE;
Net_NewMakeTic ();
DThinker::RunThinkers ();
C_RunDelayedCommands();
gamestate = GS_STARTUP;
if (!restart)
@ -2646,7 +2646,7 @@ void D_DoomMain (void)
G_InitNew(startmap, false);
if (StoredWarp.IsNotEmpty())
{
AddCommandString(StoredWarp.LockBuffer());
AddCommandString(StoredWarp);
StoredWarp = NULL;
}
}