OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom into GZDoomUpdate-12-07-2023

Browse source
This commit is contained in:
nashmuhandes 2023-07-12 20:51:41 +08:00
commit 07f722b6f3
74 changed files with 773 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/playsim/p_mobj.cpp
View file

@ -1324,18 +1324,36 @@ bool AActor::Massacre ()
//
//----------------------------------------------------------------------------
FSerializer &Serialize(FSerializer &arc, const char *key, ModelOverride &sid, ModelOverride *def)
{
arc.BeginObject(key);
arc("modelID", sid.modelID);
arc("surfaceSkinIDs", sid.surfaceSkinIDs);
arc.EndObject();
return arc;
}
void DActorModelData::Serialize(FSerializer& arc)
{
Super::Serialize(arc);
arc("modelDef", modelDef)
("modelIDs", modelIDs)
("models", models)
("skinIDs", skinIDs)
("surfaceSkinIDs", surfaceSkinIDs)
//("surfaceSkinIDs", surfaceSkinIDs)
("animationIDs", animationIDs)
("modelFrameGenerators", modelFrameGenerators)
("hasModel", hasModel);
}
void DActorModelData::OnDestroy()
{
models.Reset();
modelFrameGenerators.Reset();
skinIDs.Reset();
//surfaceSkinIDs.Reset();
animationIDs.Reset();
}
//----------------------------------------------------------------------------
//
// PROC P_ExplodeMissile