- Blood: add all statically stored EventObjects to the GC processor.

ZDoom · Dec 18, 2022 · 2d551e6 · 2d551e6
1 parent a9ad2a3
commit 2d551e6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/source/core/shared_hud.cpp b/source/core/shared_hud.cpp
@@ -138,7 +138,6 @@ void CreateAltHUD()
 {
 	if (AltHud)
 	{
-		GC::DelSoftRoot(AltHud);
 		AltHud->Destroy();
 		AltHud = nullptr;
 	}
@@ -152,7 +151,7 @@ void CreateAltHUD()
 		AltHud = DoCreateAltHUD(NAME_AltHud);
 
 	assert(AltHud);
-	GC::AddSoftRoot(AltHud);
+	GC::AddMarkerFunc([]() { GC::Mark(AltHud); });
 }
 
 

diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp
@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "texturemanager.h"
 #include "statusbar.h"
 #include "vm.h"
+#include "nnexts.h"
 
 BEGIN_BLD_NS
 
@@ -74,6 +75,8 @@ IMPLEMENT_POINTERS_END
 //
 //---------------------------------------------------------------------------
 void MarkSprInSect();
+void MarkSeq();
+
 
 size_t DBloodActor::PropagateMark()
 {
@@ -101,6 +104,15 @@ static void markgcroots()
 		GC::Mark(pl.fragger);
 		GC::Mark(pl.voodooTarget);
 	}
+	for (auto& evobj : rxBucket)
+	{
+		evobj.Mark();
+	}
+	for (auto& cond : gConditions)
+	{
+		for (auto& obj : cond.objects) obj.obj.Mark();
+	}
+	MarkSeq();
 }
 
 

diff --git a/source/games/blood/src/eventq.h b/source/games/blood/src/eventq.h
@@ -118,7 +118,7 @@ enum {
 	kChannelMax = 4096,
 };
 
-extern EventObject rxBucket[];
+extern EventObject rxBucket[kChannelMax];
 extern unsigned short bucketHead[];
 
 enum COMMAND_ID {

diff --git a/source/games/blood/src/seq.cpp b/source/games/blood/src/seq.cpp
@@ -464,10 +464,20 @@ struct ActiveList
 		remove(SS_SPRITE, EventObject(actor));
 	}
 
+	void Mark()
+	{
+		for (auto& seqinst : list) seqinst.target.Mark();
+	}
+
 };
 
 static ActiveList activeList;
 
+void MarkSeq()
+{
+	activeList.Mark();
+}
+
 //---------------------------------------------------------------------------
 //
 //