zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-28 14:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed last remaining accesses to sprite[] and xsprite[] from nnexts.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-04 20:51:53 +02:00
parent 85c4b96177
commit 165b2f29ff
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/blood/src/nnexts.cpp
View file

@ -3656,7 +3656,7 @@ void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, int index, DBloodAc
int nSpawned = InsertSprite(pSprite->sectnum, kStatDecoration); int nSpawned = InsertSprite(pSprite->sectnum, kStatDecoration);
auto spawned = &bloodActors[nSpawned]; auto spawned = &bloodActors[nSpawned];
auto pSpawned = &spawned->s(); auto pSpawned = &spawned->s();
int top, bottom; GetSpriteExtents(&sprite[index], &top, &bottom); int top, bottom; GetActorExtents(spawned, &top, &bottom);
pSpawned->x = pSprite->x; pSpawned->x = pSprite->x;
pSpawned->y = pSprite->y; pSpawned->y = pSprite->y;
switch (pXSource->data3) switch (pXSource->data3)
@ -6303,7 +6303,7 @@ int useCondition(DBloodActor* sourceactor, const EVENT& event)
if (objType == OBJ_SPRITE && event.actor == nullptr) return -1; if (objType == OBJ_SPRITE && event.actor == nullptr) return -1;
if (objType == OBJ_SPRITE) objIndex = event.actor->s().index; // need this below for calling nnExtTriggerObject if (objType == OBJ_SPRITE) objIndex = event.actor->s().index; // need this below for calling nnExtTriggerObject
if (objType == OBJ_SPRITE && event.actor != sourceactor) if (objType == OBJ_SPRITE && event.actor != sourceactor)
srcIsCondition = (sprite[objIndex].type == kModernCondition || sprite[objIndex].type == kModernConditionFalse); srcIsCondition = (event.actor->s().type == kModernCondition || event.actor->s().type == kModernConditionFalse);
// if it's a tracking condition, it must ignore all the commands sent from objects // if it's a tracking condition, it must ignore all the commands sent from objects
if (pXSource->busyTime > 0 && event.funcID != kCallbackMax) return -1; if (pXSource->busyTime > 0 && event.funcID != kCallbackMax) return -1;
@ -8592,7 +8592,7 @@ DBloodActor* aiPatrolSearchTargets(DBloodActor* actor)
continue; continue;
spritetype* pSteal = &iactor->s(); spritetype* pSteal = &iactor->s();
XSPRITE* pXSteal = &xsprite[pSteal->extra]; XSPRITE* pXSteal = &iactor->x();
if (pXSteal->locked) // ignore locked regions if (pXSteal->locked) // ignore locked regions
continue; continue;