OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved most of the root marking out of the garbage collector, replacing it with callbacks.

Browse source 
Yet another place where low level code was tied too tightly to the game instead of providing a proper interface.
This commit is contained in:
Christoph Oelckers 2020-04-11 19:24:28 +02:00
commit 74c5f83658
6 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/d_main.cpp
View file

@ -2748,6 +2748,27 @@ static void Doom_CastSpriteIDToString(FString* a, unsigned int b)
*a = (b >= sprites.Size()) ? "TNT1" : sprites[b].name;
}
extern DThinker* NextToThink;
static void GC_MarkGameRoots()
{
GC::Mark(DIntermissionController::CurrentIntermission);
GC::Mark(staticEventManager.FirstEventHandler);
GC::Mark(staticEventManager.LastEventHandler);
for (auto Level : AllLevels())
Level->Mark();
// Mark players.
for (int i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i])
players[i].PropagateMark();
}
// NextToThink must not be freed while thinkers are ticking.
GC::Mark(NextToThink);
}
//==========================================================================
//
// D_DoomMain
@ -2764,6 +2785,7 @@ static int D_DoomMain_Internal (void)
int argcount;
FIWadManager *iwad_man;
GC::AddMarkerFunc(GC_MarkGameRoots);
VM_CastSpriteIDToString = Doom_CastSpriteIDToString;
// Set up the button list. Mlook and Klook need a bit of extra treatment.