OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved all service code to 'common'.

Browse source 
This needs to work on Raze as well!
This commit is contained in:
Christoph Oelckers 2023-03-26 10:55:09 +02:00
commit 9fbac8f1d4
2 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/gamedata/info.cpp
View file

@ -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();