Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Magnus Norddahl 2016-06-10 16:59:20 +02:00
commit 9420826094
32 changed files with 431 additions and 236 deletions

View file

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