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 owner type parameter to iterator

Browse source
This commit is contained in:
Boondorl 2025-01-24 18:23:35 -05:00 committed by Ricardo Luís Vaz Silva
parent 14f7a10ae6
commit 3d6506df5b
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/scripting/vmiterators.cpp
View file

@ -420,13 +420,16 @@ public:
Reinit();
}
DBehaviorIterator(const FLevelLocals& level, PClass* type)
DBehaviorIterator(const FLevelLocals& level, PClass* type, PClass* ownerType)
{
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);
}
@ -466,16 +469,17 @@ DEFINE_ACTION_FUNCTION_NATIVE(DBehaviorIterator, CreateFrom, CreateBehaviorItFro
ACTION_RETURN_OBJECT(CreateBehaviorItFromActor(mobj, type));
}
static DBehaviorIterator* CreateBehaviorIt(PClass* type)
static DBehaviorIterator* CreateBehaviorIt(PClass* type, PClass* ownerType)
{
return Create<DBehaviorIterator>(*primaryLevel, type);
return Create<DBehaviorIterator>(*primaryLevel, type, ownerType);
}
DEFINE_ACTION_FUNCTION_NATIVE(DBehaviorIterator, Create, CreateBehaviorIt)
{
PARAM_PROLOGUE;
PARAM_CLASS(type, DBehavior);
ACTION_RETURN_OBJECT(CreateBehaviorIt(type));
PARAM_CLASS(ownerType, AActor);
ACTION_RETURN_OBJECT(CreateBehaviorIt(type, ownerType));
}
static DBehavior* NextBehavior(DBehaviorIterator* self)

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

@ -86,7 +86,7 @@ class Behavior native play abstract
class BehaviorIterator native abstract final
{
native static BehaviorIterator CreateFrom(Actor mobj, class<Behavior> type = null);
native static BehaviorIterator Create(class<Behavior> type = null);
native static BehaviorIterator Create(class<Behavior> type = null, class<Actor> ownerType = null);
native Behavior Next();
native void Reinit();