zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- got rid of a few sprite/xsprite references.

Browse source 
# Conflicts:
#	source/games/blood/src/actor.cpp
This commit is contained in:
Christoph Oelckers 2021-08-17 14:32:32 +02:00
parent 2cfb4f908e
commit ebdb4927cc
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/games/blood/src/actor.cpp
View file

@ -5994,7 +5994,7 @@ static void actCheckExplosion()
if (pExplodeInfo->burnTime) if (pExplodeInfo->burnTime)
{ {
assert(dudeactor->hasX()); assert(dudeactor->hasX());
XSPRITE* pXDude = &xsprite[pDude->extra]; XSPRITE* pXDude = &dudeactor->x();
if (!pXDude->burnTime) evPost(dudeactor, 0, kCallbackFXFlameLick); if (!pXDude->burnTime) evPost(dudeactor, 0, kCallbackFXFlameLick);
actBurnSprite(Owner, dudeactor, pExplodeInfo->burnTime << 2); actBurnSprite(Owner, dudeactor, pExplodeInfo->burnTime << 2);
} }
@ -6063,17 +6063,18 @@ static void actCheckExplosion()
for (int i = 0; i < gImpactSpritesCount; i++) for (int i = 0; i < gImpactSpritesCount; i++)
{ {
if (gImpactSpritesList[i] == -1) continue; if (gImpactSpritesList[i] == -1) continue;
else if (sprite[gImpactSpritesList[i]].sectnum < 0 || (sprite[gImpactSpritesList[i]].flags & kHitagFree) != 0) auto impactactor = &bloodActors[gImpactSpritesList[i]];
auto impactsprite = &impactactor->s();
if (impactsprite->sectnum < 0 || (impactsprite->flags & kHitagFree) != 0)
continue; continue;
spritetype* pImpact = &sprite[gImpactSpritesList[i]]; if (impactsprite->extra <= 0)
if (pImpact->extra <= 0)
continue; continue;
XSPRITE* pXImpact = &xsprite[pImpact->extra]; XSPRITE* pXImpact = &impactactor->x();
if (/*pXImpact->state == pXImpact->restState ||*/ !TestBitString(sectormap, pImpact->sectnum) || !CheckProximity(pImpact, x, y, z, nSector, radius)) if (/*pXImpact->state == pXImpact->restState ||*/ !TestBitString(sectormap, impactsprite->sectnum) || !CheckProximity(impactsprite, x, y, z, nSector, radius))
continue; continue;
trTriggerSprite(pImpact->index, pXImpact, kCmdSpriteImpact); trTriggerSprite(impactsprite->index, pXImpact, kCmdSpriteImpact);
} }
} }
@ -6333,12 +6334,13 @@ void actCheckFlares()
viewBackupSpriteLoc(actor); viewBackupSpriteLoc(actor);
spritetype* pTarget = &target->s(); spritetype* pTarget = &target->s();
auto pXTarget = target->hasX()? &target->x() : nullptr;
if (pTarget->statnum == kMaxStatus) if (pTarget->statnum == kMaxStatus)
{ {
GibSprite(pSprite, GIBTYPE_17, NULL, NULL); GibSprite(pSprite, GIBTYPE_17, NULL, NULL);
actPostSprite(actor, kStatFree); actPostSprite(actor, kStatFree);
} }
if (pTarget->extra > 0 && xsprite[pTarget->extra].health > 0) if (pXTarget && pXTarget->health > 0)
{ {
int x = pTarget->x + mulscale30r(Cos(pXSprite->goalAng + pTarget->ang), pTarget->clipdist * 2); int x = pTarget->x + mulscale30r(Cos(pXSprite->goalAng + pTarget->ang), pTarget->clipdist * 2);
int y = pTarget->y + mulscale30r(Sin(pXSprite->goalAng + pTarget->ang), pTarget->clipdist * 2); int y = pTarget->y + mulscale30r(Sin(pXSprite->goalAng + pTarget->ang), pTarget->clipdist * 2);