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

8
src/p_saveg.cpp
View file

@ -524,6 +524,14 @@ void P_SerializeThinkers (FArchive &arc, bool hubLoad)
DThinker::SerializeAll (arc, hubLoad);
}
void P_DestroyThinkers(bool hubLoad)
{
if (hubLoad)
DThinker::DestroyMostThinkers();
else
DThinker::DestroyAllThinkers();
}
//==========================================================================
//
// ArchiveSounds