OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source 
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/win32/hardware.cpp
#	wadsrc/static/menudef.txt
This commit is contained in:
raa-eruanna 2016-09-08 03:26:11 -04:00
commit dede94b7e2
731 changed files with 94186 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -1478,6 +1478,7 @@ void G_AirControlChanged ()
//
//
//==========================================================================
void gl_SerializeGlobals(FArchive &arc);
void G_SerializeLevel (FArchive &arc, bool hubLoad)
{
@ -1485,6 +1486,7 @@ void G_SerializeLevel (FArchive &arc, bool hubLoad)
Renderer->StartSerialize(arc);
if (arc.IsLoading()) P_DestroyThinkers(hubLoad);
gl_SerializeGlobals(arc);
arc << level.flags
<< level.flags2