OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- reroute all uses of FActorIterator and NActorIterator through FLevelLocals.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-24 18:50:22 +01:00
commit 4c250a58ca
9 changed files with 91 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_things.cpp
View file

@ -57,7 +57,7 @@ bool P_Thing_Spawn (int tid, AActor *source, int type, DAngle angle, bool fog, i
int rtn = 0;
PClassActor *kind;
AActor *spot, *mobj;
FActorIterator iterator (tid);
auto iterator = level.GetActorIterator(tid);
kind = P_GetSpawnableType(type);
@ -150,10 +150,10 @@ bool P_Thing_Move (int tid, AActor *source, int mapspot, bool fog)
if (tid != 0)
{
FActorIterator iterator1(tid);
auto iterator1 = level.GetActorIterator(tid);
source = iterator1.Next();
}
FActorIterator iterator2 (mapspot);
auto iterator2 = level.GetActorIterator(mapspot);
target = iterator2.Next ();
if (source != NULL && target != NULL)
@ -263,7 +263,7 @@ bool P_Thing_Projectile (int tid, AActor *source, int type, const char *type_nam
int rtn = 0;
PClassActor *kind;
AActor *spot, *mobj, *targ = forcedest;
FActorIterator iterator (tid);
auto iterator = level.GetActorIterator(tid);
int defflags3;
if (type_name == NULL)
@ -297,7 +297,7 @@ bool P_Thing_Projectile (int tid, AActor *source, int type, const char *type_nam
}
while (spot != NULL)
{
FActorIterator tit (dest);
auto tit = level.GetActorIterator(dest);
if (dest == 0 || (targ = tit.Next()))
{
@ -396,7 +396,7 @@ bool P_Thing_Projectile (int tid, AActor *source, int type, const char *type_nam
int P_Thing_Damage (int tid, AActor *whofor0, int amount, FName type)
{
FActorIterator iterator (tid);
auto iterator = level.GetActorIterator(tid);
int count = 0;
AActor *actor;