diff options
| author | Strangerke | 2016-09-19 00:17:36 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-19 00:17:36 +0200 |
| commit | 4a8c8a53bd5095723883ff52e3b3cf4fb231558c (patch) | |
| tree | 23b006e47d5dfa485608ce24f5637040ab15b5fa /engines/dm/projexpl.cpp | |
| parent | 383cc850b99cc7b2ed30e9fde9bbf77a128f0e6d (diff) | |
| download | scummvm-rg350-4a8c8a53bd5095723883ff52e3b3cf4fb231558c.tar.gz scummvm-rg350-4a8c8a53bd5095723883ff52e3b3cf4fb231558c.tar.bz2 scummvm-rg350-4a8c8a53bd5095723883ff52e3b3cf4fb231558c.zip | |
DM: Rename members of SoundIndex
Diffstat (limited to 'engines/dm/projexpl.cpp')
| -rw-r--r-- | engines/dm/projexpl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index cc6cb9a523..81751a0bfc 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -212,11 +212,11 @@ bool ProjExpl::hasProjectileImpactOccurred(int16 impactType, int16 mapXCombo, in } else { uint16 soundIndex; if ((projectileAssociatedThing).getType() == kDMThingTypeWeapon) - soundIndex = k00_soundMETALLIC_THUD; + soundIndex = kDMSoundIndexMetallicThud; else if (projectileAssociatedThing == Thing::_explPoisonBolt) - soundIndex = k13_soundSPELL; + soundIndex = kDMSoundIndexSpell; else - soundIndex = k04_soundWOODEN_THUD_ATTACK_TROLIN_ANTMAN_STONE_GOLEM; + soundIndex = kDMSoundIndexWoodenThudAttackTrolinAntmanStoneGolem; _vm->_sound->requestPlay(soundIndex, projectileMapX, projectileMapY, kDMSoundModePlayIfPrioritized); } @@ -304,10 +304,10 @@ void ProjExpl::createExplosion(Thing explThing, uint16 attack, uint16 mapXCombo, explosion->setType(explThing.toUint16() - Thing::_firstExplosion.toUint16()); explosion->setAttack(attack); if (explThing.toUint16() < Thing::_explHarmNonMaterial.toUint16()) { - uint16 soundIndex = (attack > 80) ? k05_soundSTRONG_EXPLOSION : k20_soundWEAK_EXPLOSION; + uint16 soundIndex = (attack > 80) ? kDMSoundIndexStrongExplosion : kDMSoundIndexWeakExplosion; _vm->_sound->requestPlay(soundIndex, projectileMapX, projectileMapY, kDMSoundModePlayIfPrioritized); } else if (explThing != Thing::_explSmoke) - _vm->_sound->requestPlay(k13_soundSPELL, projectileMapX, projectileMapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexSpell, projectileMapX, projectileMapY, kDMSoundModePlayIfPrioritized); _vm->_dungeonMan->linkThingToList(unusedThing, Thing(0), projectileMapX, projectileMapY); TimelineEvent newEvent; @@ -525,7 +525,7 @@ void ProjExpl::processEvent25(TimelineEvent *event) { break; case 0xFFE4: explosion->setType(explosion->getType() + 1); - _vm->_sound->requestPlay(k05_soundSTRONG_EXPLOSION, mapX, mapY, kDMSoundModePlayIfPrioritized); + _vm->_sound->requestPlay(kDMSoundIndexStrongExplosion, mapX, mapY, kDMSoundModePlayIfPrioritized); AddEventFl = true; break; case 0xFFA8: |