OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Clean up for Behavior API

Browse source 
Use TObjPtr to improve null checking. Add option to clear only specific kinds of Behaviors. Fixed removal checks while ticking. Don't stop at now-null behaviors when iterating.
This commit is contained in:
Boondorl 2025-01-28 07:38:52 -05:00 • committed by Ricardo Luís Vaz Silva
commit 7efd301810
6 changed files with 88 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/scripting/vmiterators.cpp
View file

@ -400,21 +400,21 @@ class DBehaviorIterator : public DObject
{
DECLARE_ABSTRACT_CLASS(DBehaviorIterator, DObject)
size_t _index;
TArray<DBehavior*> _behaviors;
TArray<TObjPtr<DBehavior*>> _behaviors;
public:
DBehaviorIterator(const AActor& mobj, PClass* type)
{
TMap<FName, DBehavior*>::ConstIterator it = { mobj.Behaviors };
TMap<FName, DBehavior*>::ConstPair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::ConstIterator it = { mobj.Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::ConstPair* pair = nullptr;
while (it.NextPair(pair))
{
auto b = pair->Value;
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
auto b = pair->Value.Get();
if (b == nullptr)
continue;
if (type == nullptr || b->IsKindOf(type))
_behaviors.Push(b);
_behaviors.Push(pair->Value);
}
Reinit();
@ -424,14 +424,11 @@ public:
{
for (auto& b : level.ActorBehaviors)
{
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
continue;
if (ownerType != nullptr && !b->Owner->IsKindOf(ownerType))
continue;
if (type == nullptr || b->IsKindOf(type))
_behaviors.Push(b);
_behaviors.Push(MakeObjPtr<DBehavior*>(b));
}
Reinit();
@ -439,10 +436,14 @@ public:
DBehavior* Next()
{
if (_index >= _behaviors.Size())
return nullptr;
while (_index < _behaviors.Size())
{
auto b = _behaviors[_index++].Get();
if (b != nullptr)
return b;
}
return _behaviors[_index++];
return nullptr;
}
void Reinit() { _index = 0u; }