OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/g_level.cpp
This commit is contained in:
Christoph Oelckers 2016-06-01 11:45:57 +02:00
commit 18ebe92cfc
18 changed files with 343 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/g_level.cpp
View file

@ -1480,6 +1480,7 @@ void G_SerializeLevel (FArchive &arc, bool hubLoad)
int i = level.totaltime;
Renderer->StartSerialize(arc);
if (arc.IsLoading()) P_DestroyThinkers(hubLoad);
gl_SerializeGlobals(arc);
arc << level.flags