From 8af7049c003452f055a8453ff2c1ff45a633163f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 8 Oct 2023 17:52:45 +0200 Subject: [PATCH] use symbolic constants for explosion types. --- source/games/blood/src/actor.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index d0c6a2752..83175126f 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -4126,7 +4126,7 @@ void actExplodeSprite(DBloodActor* actor) case kTrapExploder: { // Defaults for exploder - nType = 1; + nType = kExplosionStandard; int nSnd = 304; int nSeq = 4; @@ -4137,13 +4137,13 @@ void actExplodeSprite(DBloodActor* actor) int tSeq = actor->xspr.data2; // SEQ id int tSnd = actor->xspr.data3; // Sound Id - if (nType <= 1 || nType > kExplodeMax) { nType = 1; nSeq = 4; nSnd = 304; } - else if (nType == 2) { nSeq = 4; nSnd = 305; } - else if (nType == 3) { nSeq = 9; nSnd = 307; } - else if (nType == 4) { nSeq = 5; nSnd = 307; } - else if (nType <= 6) { nSeq = 4; nSnd = 303; } - else if (nType == 7) { nSeq = 4; nSnd = 303; } - else if (nType == 8) { nType = 0; nSeq = 3; nSnd = 303; } + if (nType <= kExplosionStandard || nType > kExplodeMax) { nType = 1; nSeq = 4; nSnd = 304; } + else if (nType == kExplosionLarge) { nSeq = 4; nSnd = 305; } + else if (nType == kExplosionFireball) { nSeq = 9; nSnd = 307; } + else if (nType == kExplosionSpray) { nSeq = 5; nSnd = 307; } + else if (nType <= kExplosion6) { nSeq = 4; nSnd = 303; } + else if (nType == kExplosionNapalm) { nSeq = 4; nSnd = 303; } + else if (nType == kExplosionMax) { nType = 0; nSeq = 3; nSnd = 303; } // Override previous sound and seq assigns if (tSeq > 0) nSeq = tSeq;