Merge branch '4.14.2' into gz_merge
This commit is contained in:
commit
9aa44fa13b
83 changed files with 927 additions and 270 deletions
|
|
@ -355,12 +355,12 @@ void FThinkerCollection::SerializeThinkers(FSerializer &arc, bool hubLoad)
|
|||
else if (thinker->ObjectFlags & OF_JustSpawned)
|
||||
{
|
||||
FreshThinkers[i].AddTail(thinker);
|
||||
thinker->PostSerialize();
|
||||
thinker->CallPostSerialize();
|
||||
}
|
||||
else
|
||||
{
|
||||
Thinkers[i].AddTail(thinker);
|
||||
thinker->PostSerialize();
|
||||
thinker->CallPostSerialize();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -773,6 +773,16 @@ void DThinker::PostSerialize()
|
|||
{
|
||||
}
|
||||
|
||||
void DThinker::CallPostSerialize()
|
||||
{
|
||||
PostSerialize();
|
||||
IFOVERRIDENVIRTUALPTRNAME(this, NAME_Thinker, OnLoad)
|
||||
{
|
||||
VMValue params[] = { this };
|
||||
VMCall(func, params, 1, nullptr, 0);
|
||||
}
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
//
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue