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

- cleanup

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-29 22:04:35 +02:00
parent b2de1e5209
commit 245581e00d
3 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7324,7 +7324,7 @@ void actPostProcess(void)
{
evKillActor(p.sprite);
if (p.sprite->hasX()) seqKill(p.sprite);
DeleteSprite(p.sprite->s().index);
DeleteSprite(p.sprite);
}
}
else

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

@ -216,7 +216,7 @@ void Respawn(DBloodActor* actor, int) // 9
if (!actor) return;
spritetype *pSprite = &actor->s();
assert(pSprite->extra > 0 && pSprite->extra < kMaxXSprites);
XSPRITE *pXSprite = &xsprite[pSprite->extra];
XSPRITE *pXSprite = &actor->x();
if (pSprite->statnum != kStatRespawn && pSprite->statnum != kStatThing) {
viewSetSystemMessage("Sprite #%d is not on Respawn or Thing list\n", actor->GetIndex());
@ -405,8 +405,7 @@ void fxBloodBits(DBloodActor* actor, int) // 14
gFX.fxSpawnActor(FX_48, pSprite->sectnum, x, y, pSprite->z, 0);
if (pSprite->ang == 1024)
{
int nChannel = 28+(pSprite->index&2);
assert(nChannel < 32);
int nChannel = 28 + (actor->GetIndex() & 2); // this is a little stupid...
sfxPlay3DSound(pSprite, 385, nChannel, 1);
}
if (Chance(0x5000))
@ -459,8 +458,7 @@ void fxBouncingSleeve(DBloodActor* actor, int) // 16
return;
}
int nChannel = 28 + (pSprite->index & 2);
assert(nChannel < 32);
int nChannel = 28 + (actor->GetIndex() & 2);
// tommy sleeve
if (pSprite->type >= 37 && pSprite->type <= 39) {
@ -508,18 +506,16 @@ void returnFlagToBase(DBloodActor* actor, int) // 17
auto owner = actor->GetOwner();
if (owner)
{
spritetype* pOwner = &owner->s();
XSPRITE* pXOwner = &owner->x();
switch (pSprite->type)
{
case kItemFlagA:
trTriggerSprite(pOwner->index, pXOwner, kCmdOn);
trTriggerSprite(owner, kCmdOn);
sndStartSample(8003, 255, 2, 0);
gBlueFlagDropped = false;
viewSetMessage("Blue Flag returned to base.");
break;
case kItemFlagB:
trTriggerSprite(pOwner->index, pXOwner, kCmdOn);
trTriggerSprite(owner, kCmdOn);
sndStartSample(8002, 255, 2, 0);
gRedFlagDropped = false;
viewSetMessage("Red Flag returned to base.");
@ -565,7 +561,7 @@ void fxPodBloodSplat(DBloodActor* actor, int) // 19
int y = pSprite->y+MulScale(nDist, Sin(nAngle), 28);
if (pSprite->ang == 1024)
{
int nChannel = 28+(pSprite->index&2);
int nChannel = 28 + (actor->GetIndex() & 2);
assert(nChannel < 32);
sfxPlay3DSound(pSprite, 385, nChannel, 1);
}
@ -598,7 +594,7 @@ void LeechStateTimer(DBloodActor* actor, int) // 20
#ifdef NOONE_EXTENSIONS
case kModernThingEnemyLifeLeech:
#endif
xsprite[pSprite->extra].stateTimer = 0;
actor->x().stateTimer = 0;
break;
}
}

13
source/games/blood/src/eventq.cpp
View file

@ -294,21 +294,18 @@ void evInit()
}
}
for (int i = 0; i < kMaxSprites; i++)
BloodLinearSpriteIterator it;
while (auto actor = it.Next())
{
if (sprite[i].statnum < kMaxStatus)
if (actor->hasX() && actor->x().rxID > 0)
{
int nXSprite = sprite[i].extra;
if (nXSprite > 0 && xsprite[nXSprite].rxID > 0)
{
assert(nCount < kChannelMax);
rxBucket[nCount].type = SS_SPRITE;
rxBucket[nCount].rxindex = i;
rxBucket[nCount].actor = &bloodActors[i];
rxBucket[nCount].rxindex = 0;
rxBucket[nCount].actor = actor;
nCount++;
}
}
}
SortRXBucket(nCount);
bucketCount = nCount;