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

- removed the last references to sprite[] in bullet.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-20 00:38:21 +02:00
parent 99e189fa2b
commit ae786bff98
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/games/exhumed/src/bullet.cpp
View file

@ -83,7 +83,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, Bullet& w, Bullet*
("at12", w.field_12, def->field_12) ("at12", w.field_12, def->field_12)
("at13", w.nDoubleDamage, def->nDoubleDamage) ("at13", w.nDoubleDamage, def->nDoubleDamage)
("enemy", w.pEnemy, def->pEnemy) ("enemy", w.pEnemy, def->pEnemy)
//("owner", w.pOwner, def->pOwner)
.EndObject(); .EndObject();
} }
return arc; return arc;
@ -173,13 +172,13 @@ void IgniteSprite(DExhumedActor* pActor)
} }
} }
void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, int x, int y, int z, int nSector) void BulletHitsSprite(Bullet *pBullet, DExhumedActor* pBulletActor, DExhumedActor* pHitActor, int x, int y, int z, int nSector)
{ {
assert(nSector >= 0 && nSector < kMaxSectors); assert(nSector >= 0 && nSector < kMaxSectors);
bulletInfo *pBulletInfo = &BulletInfo[pBullet->nType]; bulletInfo *pBulletInfo = &BulletInfo[pBullet->nType];
auto pHitSprite = &sprite[nHitSprite]; auto pHitSprite = &pHitActor->s();
short nStat = pHitSprite->statnum; short nStat = pHitSprite->statnum;
switch (pBullet->nType) switch (pBullet->nType)
@ -193,7 +192,7 @@ void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, in
pHitSprite->hitag++; pHitSprite->hitag++;
if (pHitSprite->hitag == 15) { if (pHitSprite->hitag == 15) {
IgniteSprite(&exhumedActors[nHitSprite]); IgniteSprite(pHitActor);
} }
if (!RandomSize(2)) { if (!RandomSize(2)) {
@ -208,7 +207,7 @@ void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, in
return; return;
} }
// else - fall through to below cases // else - fall through to below cases
fallthrough__; [[fallthrough]];
} }
case 1: case 1:
case 2: case 2:
@ -226,7 +225,6 @@ void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, in
auto pActor = pBullet->pActor; auto pActor = pBullet->pActor;
spritetype *pSprite = &pActor->s(); spritetype *pSprite = &pActor->s();
spritetype *pHitSprite = &sprite[nHitSprite];
if (nStat == kStatAnubisDrum) if (nStat == kStatAnubisDrum)
{ {
@ -244,7 +242,7 @@ void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, in
pHitSprite->xvel = bcos(pSprite->ang, -2); pHitSprite->xvel = bcos(pSprite->ang, -2);
pHitSprite->yvel = bsin(pSprite->ang, -2); pHitSprite->yvel = bsin(pSprite->ang, -2);
MoveCreature(nHitSprite); MoveCreature(pHitActor);
pHitSprite->xvel = xVel; pHitSprite->xvel = xVel;
pHitSprite->yvel = yVel; pHitSprite->yvel = yVel;
@ -264,7 +262,7 @@ void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, in
nDamage *= 2; nDamage *= 2;
} }
runlist_DamageEnemy(nHitSprite, nBulletSprite, nDamage); runlist_DamageEnemy(pHitActor, pBulletActor, nDamage);
if (nStat <= 90 || nStat >= 199) if (nStat <= 90 || nStat >= 199)
{ {
@ -481,7 +479,7 @@ HITSPRITE:
} }
else else
{ {
BulletHitsSprite(pBullet, pSprite->owner, hitactor->GetSpriteIndex(), x2, y2, z2, hitsect); BulletHitsSprite(pBullet, pActor->pTarget, hitactor, x2, y2, z2, hitsect);
} }
} }
else if (hitwall > -1) else if (hitwall > -1)
@ -600,7 +598,7 @@ DExhumedActor* BuildBullet(DExhumedActor* pActor, int nType, int nZOffset, int n
assert(pTargetSprite->sectnum >= 0 && pTargetSprite->sectnum < kMaxSectors); assert(pTargetSprite->sectnum >= 0 && pTargetSprite->sectnum < kMaxSectors);
BulletHitsSprite(&sBullet, pActor->GetSpriteIndex(), pTarget->GetSpriteIndex(), pTargetSprite->x, pTargetSprite->y, pTargetSprite->z - (nHeight >> 1), pTargetSprite->sectnum); BulletHitsSprite(&sBullet, pActor, pTarget, pTargetSprite->x, pTargetSprite->y, pTargetSprite->z - (nHeight >> 1), pTargetSprite->sectnum);
DeleteActor(sBullet.pActor); DeleteActor(sBullet.pActor);
return nullptr; return nullptr;
} }
@ -669,10 +667,10 @@ DExhumedActor* BuildBullet(DExhumedActor* pActor, int nType, int nZOffset, int n
pBulletSprite->xvel = 0; pBulletSprite->xvel = 0;
pBulletSprite->yvel = 0; pBulletSprite->yvel = 0;
pBulletSprite->zvel = 0; pBulletSprite->zvel = 0;
pBulletSprite->owner = pActor->GetSpriteIndex();
pBulletSprite->lotag = runlist_HeadRun() + 1; pBulletSprite->lotag = runlist_HeadRun() + 1;
pBulletSprite->extra = -1; pBulletSprite->extra = -1;
pBulletSprite->hitag = 0; pBulletSprite->hitag = 0;
pBulletActor->pTarget = pActor;
pBulletActor->nPhase = nBullet; pBulletActor->nPhase = nBullet;
// GrabTimeSlot(3); // GrabTimeSlot(3);
@ -869,8 +867,7 @@ void AIBullet::Draw(RunListEvent* ev)
short nSeq = SeqOffsets[BulletList[nBullet].nSeq]; short nSeq = SeqOffsets[BulletList[nBullet].nSeq];
short nSprite2 = ev->nParam; ev->pTSprite->statnum = 1000;
mytsprite[nSprite2].statnum = 1000;
if (BulletList[nBullet].nType == 15) if (BulletList[nBullet].nType == 15)
{ {

2
source/games/exhumed/src/snake.cpp
View file

@ -420,7 +420,7 @@ void AISnake::Draw(RunListEvent* ev)
seq_PlotSequence(nSprite, SeqOffsets[kSeqSnakBody], 0, 0); seq_PlotSequence(nSprite, SeqOffsets[kSeqSnakBody], 0, 0);
} }
mytsprite[nSprite].owner = -1; ev->pTSprite->owner = -1;
} }