zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-08-26 02:20:53 +02:00
commit 58bc64ee8f
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dthinker.h
View file

@ -77,6 +77,11 @@ public:
static void RunThinkers (int statnum); static void RunThinkers (int statnum);
static void DestroyAllThinkers (); static void DestroyAllThinkers ();
static void DestroyMostThinkers (); static void DestroyMostThinkers ();
static void DestroyThinkersInList(int statnum)
{
DestroyThinkersInList(Thinkers[STAT_TRAVELLING]);
DestroyThinkersInList(FreshThinkers[STAT_TRAVELLING]);
}
static void SerializeAll (FArchive &arc, bool keepPlayers); static void SerializeAll (FArchive &arc, bool keepPlayers);
static void MarkRoots(); static void MarkRoots();

5
src/g_level.cpp
View file

@ -1295,6 +1295,11 @@ void G_FinishTravel ()
} }
bglobal.FinishTravel (); bglobal.FinishTravel ();
// make sure that, after travelling has completed, no travelling thinkers are left.
// Since this list is excluded from regular thinker cleaning, anything that may survive through here
// will endlessly multiply and severely break the following savegames or just simply crash on broken pointers.
DThinker::DestroyThinkersInList(STAT_TRAVELLING);
} }
//========================================================================== //==========================================================================