- moved all service code to 'common'.

This needs to work on Raze as well!
ZDoom · Mar 26, 2023 · 9fbac8f · 9fbac8f
1 parent 7537f41
commit 9fbac8f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 27 deletions.
diff --git a/src/common/scripting/interface/vmnatives.cpp b/src/common/scripting/interface/vmnatives.cpp
@@ -55,6 +55,35 @@
 
 #include "maps.h"
 
+static ZSMap<FName, DObject*> AllServices;
+
+static void MarkServices() {
+
+	ZSMap<FName, DObject*>::Iterator it(AllServices);
+	ZSMap<FName, DObject*>::Pair* pair;
+	while (it.NextPair(pair))
+	{
+		GC::Mark<DObject>(pair->Value);
+	}
+}
+
+void InitServices()
+{
+	PClass* cls = PClass::FindClass("Service");
+	for (PClass* clss : PClass::AllClasses)
+	{
+		if (clss != cls && cls->IsAncestorOf(clss))
+		{
+			DObject* obj = clss->CreateNew();
+			obj->ObjectFlags |= OF_Transient;
+			AllServices.Insert(clss->TypeName, obj);
+		}
+	}
+	GC::AddMarkerFunc(&MarkServices);
+}
+
+
+
 //==========================================================================
 //
 // status bar exports
@@ -1161,8 +1190,6 @@ DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, baseorder);
 DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, loop);
 DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, handle);
 
-extern ZSMap<FName, DObject* > AllServices;
-
 DEFINE_GLOBAL_NAMED(PClass::AllClasses, AllClasses)
 
 DEFINE_GLOBAL(AllServices)

diff --git a/src/gamedata/info.cpp b/src/gamedata/info.cpp
@@ -369,18 +369,7 @@ static void LoadAltHudStuff()
 // PClassActor :: StaticInit										STATIC
 //
 //==========================================================================
-
-ZSMap<FName, DObject*> AllServices;
-
-static void MarkServices(){
-
-	ZSMap<FName, DObject*>::Iterator it(AllServices);
-	ZSMap<FName, DObject*>::Pair *pair;
-	while (it.NextPair(pair))
-	{
-		GC::Mark<DObject>(pair->Value);
-	}
-}
+void InitServices();
 
 void PClassActor::StaticInit()
 {
@@ -407,6 +396,8 @@ void PClassActor::StaticInit()
 	if (!batchrun) Printf ("LoadActors: Load actor definitions.\n");
 	ClearStrifeTypes();
 	LoadActors ();
+	InitServices();
+
 
 	for (auto cls : AllClasses)
 	{
@@ -416,19 +407,6 @@ void PClassActor::StaticInit()
 		}
 	}
 
-	PClass * cls = PClass::FindClass("Service");
-	for(PClass * clss : PClass::AllClasses)
-	{
-		if(clss != cls && cls->IsAncestorOf(clss))
-		{
-			DObject * obj = clss->CreateNew();
-			obj->ObjectFlags |= OF_Transient;
-			AllServices.Insert(clss->TypeName, obj);
-		}
-	}
-
-	GC::AddMarkerFunc(&MarkServices);
-
 	LoadAltHudStuff();
 	InitBotStuff();