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

use symbolic constants for explosion types.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-08 17:52:45 +02:00
parent 8bb286abe0
commit 8af7049c00
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4126,7 +4126,7 @@ void actExplodeSprite(DBloodActor* actor)
case kTrapExploder: case kTrapExploder:
{ {
// Defaults for exploder // Defaults for exploder
nType = 1; nType = kExplosionStandard;
int nSnd = 304; int nSnd = 304;
int nSeq = 4; int nSeq = 4;
@ -4137,13 +4137,13 @@ void actExplodeSprite(DBloodActor* actor)
int tSeq = actor->xspr.data2; // SEQ id int tSeq = actor->xspr.data2; // SEQ id
int tSnd = actor->xspr.data3; // Sound Id int tSnd = actor->xspr.data3; // Sound Id
if (nType <= 1 || nType > kExplodeMax) { nType = 1; nSeq = 4; nSnd = 304; } if (nType <= kExplosionStandard || nType > kExplodeMax) { nType = 1; nSeq = 4; nSnd = 304; }
else if (nType == 2) { nSeq = 4; nSnd = 305; } else if (nType == kExplosionLarge) { nSeq = 4; nSnd = 305; }
else if (nType == 3) { nSeq = 9; nSnd = 307; } else if (nType == kExplosionFireball) { nSeq = 9; nSnd = 307; }
else if (nType == 4) { nSeq = 5; nSnd = 307; } else if (nType == kExplosionSpray) { nSeq = 5; nSnd = 307; }
else if (nType <= 6) { nSeq = 4; nSnd = 303; } else if (nType <= kExplosion6) { nSeq = 4; nSnd = 303; }
else if (nType == 7) { nSeq = 4; nSnd = 303; } else if (nType == kExplosionNapalm) { nSeq = 4; nSnd = 303; }
else if (nType == 8) { nType = 0; nSeq = 3; nSnd = 303; } else if (nType == kExplosionMax) { nType = 0; nSeq = 3; nSnd = 303; }
// Override previous sound and seq assigns // Override previous sound and seq assigns
if (tSeq > 0) nSeq = tSeq; if (tSeq > 0) nSeq = tSeq;