zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-04 17:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added TransferredOwner virtual

Browse source 
Allows for proper cleaning up of behaviors when moving between Actors. Important for player respawn handling and morphing.
This commit is contained in:
Boondorl 2025-01-28 09:15:56 -05:00 committed by Ricardo Luís Vaz Silva
parent 7efd301810
commit 7a4927fdf5
3 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/playsim/actor.h
View file

@ -1453,6 +1453,10 @@ public:
auto b = Behaviors.CheckKey(type);
return b != nullptr ? b->Get() : nullptr;
}
bool IsValidBehavior(const DBehavior& b) const
{
return !(b.ObjectFlags & OF_EuthanizeMe) && b.Owner.ForceGet() == this;
}
DBehavior* AddBehavior(PClass& type);
bool RemoveBehavior(FName type);
void TickBehaviors();

34
src/playsim/p_mobj.cpp
View file

@ -541,7 +541,7 @@ DBehavior* AActor::AddBehavior(PClass& type)
VMValue params[] = { b };
VMCall(func, params, 1, nullptr, 0);
if (b->ObjectFlags & OF_EuthanizeMe)
if (!IsValidBehavior(*b))
{
RemoveBehavior(type.TypeName);
return nullptr;
@ -555,7 +555,7 @@ DBehavior* AActor::AddBehavior(PClass& type)
VMValue params[] = { b };
VMCall(func, params, 1, nullptr, 0);
if (b->ObjectFlags & OF_EuthanizeMe)
if (!IsValidBehavior(*b))
{
RemoveBehavior(type.TypeName);
return nullptr;
@ -599,7 +599,7 @@ void AActor::TickBehaviors()
for (auto& b : toTick)
{
if ((b->ObjectFlags & OF_EuthanizeMe) || b->Owner != this)
if (!IsValidBehavior(*b))
{
toRemove.Push(b->GetClass()->TypeName);
continue;
@ -610,7 +610,7 @@ void AActor::TickBehaviors()
VMValue params[] = { b };
VMCall(func, params, 1, nullptr, 0);
if (b->ObjectFlags & OF_EuthanizeMe)
if (!IsValidBehavior(*b))
toRemove.Push(b->GetClass()->TypeName);
}
}
@ -645,12 +645,16 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, FindBehavior, FindBehavior)
void AActor::MoveBehaviors(AActor& from)
{
if (&from == this)
return;
// Clean these up properly before transferring.
ClearBehaviors();
Behaviors.TransferFrom(from.Behaviors);
TArray<FName> toRemove = {};
TArray<DBehavior*> toTransfer = {};
// Clean up any empty behaviors that remained as well while
// changing the owner.
@ -671,6 +675,26 @@ void AActor::MoveBehaviors(AActor& from)
b->Level->RemoveActorBehavior(*b);
Level->AddActorBehavior(*b);
}
toTransfer.Push(b);
}
for (auto& b : toTransfer)
{
if (!IsValidBehavior(*b))
{
toRemove.Push(b->GetClass()->TypeName);
continue;
}
IFOVERRIDENVIRTUALPTRNAME(b, NAME_Behavior, TransferredOwner)
{
VMValue params[] = { b, &from };
VMCall(func, params, 2, nullptr, 0);
if (!IsValidBehavior(*b))
toRemove.Push(b->GetClass()->TypeName);
}
}
for (auto& type : toRemove)
@ -5990,6 +6014,8 @@ AActor *FLevelLocals::SpawnPlayer (FPlayerStart *mthing, int playernum, int flag
const auto heldWeap = state == PST_REBORN && (dmflags3 & DF3_REMEMBER_LAST_WEAP) ? p->ReadyWeapon : nullptr;
if (state == PST_REBORN || state == PST_ENTER)
{
if (state == PST_REBORN && oldactor != nullptr)
p->mo->MoveBehaviors(*oldactor);
PlayerReborn (playernum);
}
else if (oldactor != NULL && oldactor->player == p && !(flags & SPF_TEMPPLAYER))

1
wadsrc/static/zscript/actors/actor.zs
View file

@ -80,6 +80,7 @@ class Behavior native play abstract
virtual void Initialize() {}
virtual void Reinitialize() {}
virtual void TransferredOwner(Actor oldOwner) {}
virtual void Tick() {}
}