teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-20 18:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- iterator in DoActorPickClosePlayer

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-30 15:28:26 +02:00
parent c0a72c7243
commit ae874275ec
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/sw/src/ai.cpp
View file

@ -461,19 +461,19 @@ TARGETACTOR:
if (!found && TEST(u->Flags2, SPR2_DONT_TARGET_OWNER))
{
near_dist = MAX_ACTIVE_RANGE;
StatIterator it(STAT_ENEMY);
while ((i = it.NextIndex()) >= 0)
SWStatIterator it(STAT_ENEMY);
while (auto itActor = it.Next())
{
auto itActor = &swActors[i];
if (i == SpriteNum)
if (itActor == actor || !itActor->hasU())
continue;
if (TEST(User[i]->Flags, SPR_SUICIDE|SPR_DEAD))
if (TEST(itActor->u()->Flags, SPR_SUICIDE | SPR_DEAD))
continue;
DISTANCE(sp->x, sp->y, sprite[i].x, sprite[i].y, dist, a, b, c);
auto itSp = &itActor->s();
DISTANCE(sp->x, sp->y, itSp->x, itSp->y, dist, a, b, c);
if (dist < near_dist && FAFcansee(sp->x, sp->y, look_height, sp->sectnum, sprite[i].x, sprite[i].y, SPRITEp_UPPER(&sprite[i]), sprite[i].sectnum))
if (dist < near_dist && FAFcansee(sp->x, sp->y, look_height, sp->sectnum, itSp->x, itSp->y, SPRITEp_UPPER(itSp), itSp->sectnum))
{
near_dist = dist;
u->targetActor = itActor;

2
source/games/sw/src/ai.h
View file

@ -103,8 +103,6 @@ int InitActorFindPlayer(DSWActor* actor);
int InitActorDuck(DSWActor* actor);
int DoActorDuck(DSWActor* actor);
int DoActorMoveJump(DSWActor* actor);
int move_scan(short SpriteNum,short ang,int dist,int *stopx,int *stopy,int *stopz,short *stopsect);
int FindNewAngle(short SpriteNum,signed char dir,int DistToMove);
int InitActorReposition(DSWActor* actor);
int DoActorReposition(DSWActor* actor);
int InitActorPause(DSWActor* actor);