OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added the missing Level parameters to AActor::StaticSpawn and P_ExecuteSpecial.

Browse source 
I think these were the last two still missing it, all remaining uses of the global level variable are in code that doesn't get run through a level tick and are supposed to access the primary level.
This commit is contained in:
Christoph Oelckers 2019-02-01 22:02:16 +01:00
commit 6c006a5fbd
25 changed files with 124 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/vmiterators.cpp
View file

@ -51,7 +51,7 @@ IMPLEMENT_CLASS(DThinkerIterator, true, false);
static DThinkerIterator *CreateThinkerIterator(PClass *type, int statnum)
{
return Create<DThinkerIterator>(&level, type, statnum);
return Create<DThinkerIterator>(currentVMLevel, type, statnum);
}
DEFINE_ACTION_FUNCTION_NATIVE(DThinkerIterator, Create, CreateThinkerIterator)
@ -109,7 +109,7 @@ public:
}
DBlockLinesIterator(double x, double y, double z, double height, double radius, sector_t *sec)
:FMultiBlockLinesIterator(check, &level, x, y, z, height, radius, sec)
:FMultiBlockLinesIterator(check, currentVMLevel, x, y, z, height, radius, sec)
{
cres.line = nullptr;
cres.Position.Zero();
@ -183,7 +183,7 @@ public:
}
DBlockThingsIterator(double checkx, double checky, double checkz, double checkh, double checkradius, bool ignorerestricted, sector_t *newsec)
: iterator(check, &level, checkx, checky, checkz, checkh, checkradius, ignorerestricted, newsec)
: iterator(check, currentVMLevel, checkx, checky, checkz, checkh, checkradius, ignorerestricted, newsec)
{
cres.thing = nullptr;
cres.Position.Zero();