OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved thinker storage into FLevelLocals.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-30 19:09:21 +01:00
commit 64ac6dbc6e
10 changed files with 33 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/vmiterators.cpp
View file

@ -41,8 +41,8 @@ class DThinkerIterator : public DObject, public FThinkerIterator
DECLARE_ABSTRACT_CLASS(DThinkerIterator, DObject)
public:
DThinkerIterator(PClass *cls, int statnum = MAX_STATNUM + 1)
: FThinkerIterator(cls, statnum)
DThinkerIterator(FLevelLocals *Level, PClass *cls, int statnum = MAX_STATNUM + 1)
: FThinkerIterator(Level, cls, statnum)
{
}
};
@ -51,7 +51,7 @@ IMPLEMENT_CLASS(DThinkerIterator, true, false);
static DThinkerIterator *CreateThinkerIterator(PClass *type, int statnum)
{
return Create<DThinkerIterator>(type, statnum);
return Create<DThinkerIterator>(&level, type, statnum);
}
DEFINE_ACTION_FUNCTION_NATIVE(DThinkerIterator, Create, CreateThinkerIterator)
@ -59,7 +59,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(DThinkerIterator, Create, CreateThinkerIterator)
PARAM_PROLOGUE;
PARAM_CLASS(type, DThinker);
PARAM_INT(statnum);
ACTION_RETURN_OBJECT(Create<DThinkerIterator>(type, statnum));
ACTION_RETURN_OBJECT(CreateThinkerIterator(type, statnum));
}
static DThinker *NextThinker(DThinkerIterator *self, bool exact)