OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the tid hash into FLevelLocals and adjusted the interface to the iterators.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-24 19:28:40 +01:00
commit 0e5986769e
15 changed files with 82 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/scripting/vmiterators.cpp
View file

@ -342,25 +342,25 @@ class DActorIterator : public DObject, public NActorIterator
DECLARE_ABSTRACT_CLASS(DActorIterator, DObject)
public:
DActorIterator(PClassActor *cls = nullptr, int tid = 0)
: NActorIterator(cls, tid)
DActorIterator(AActor **hash, PClassActor *cls = nullptr, int tid = 0)
: NActorIterator(hash, cls, tid)
{
}
};
IMPLEMENT_CLASS(DActorIterator, true, false);
static DActorIterator *CreateActI(int tid, PClassActor *type)
static DActorIterator *CreateActI(FLevelLocals *Level, int tid, PClassActor *type)
{
return Create<DActorIterator>(type, tid);
return Create<DActorIterator>(Level->TIDHash, type, tid);
}
DEFINE_ACTION_FUNCTION_NATIVE(DActorIterator, Create, CreateActI)
DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, CreateActorIterator, CreateActI)
{
PARAM_PROLOGUE;
PARAM_SELF_STRUCT_PROLOGUE(FLevelLocals);
PARAM_INT(tid);
PARAM_CLASS(type, AActor);
ACTION_RETURN_OBJECT(Create<DActorIterator>(type, tid));
ACTION_RETURN_OBJECT(CreateActI(self, tid, type));
}
static AActor *NextActI(DActorIterator *self)