diff options
author | Paul Gilbert | 2017-11-09 11:05:28 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-11-09 11:05:28 -0500 |
commit | cb90f861b866497efbe7a7679d6949b05b108f5e (patch) | |
tree | 54537bf3c4143ef34bc9236e9b4934aee4e0a6ff | |
parent | 381567c1a399fb4f4f1ce0bbaa515c97c99349a8 (diff) | |
download | scummvm-rg350-cb90f861b866497efbe7a7679d6949b05b108f5e.tar.gz scummvm-rg350-cb90f861b866497efbe7a7679d6949b05b108f5e.tar.bz2 scummvm-rg350-cb90f861b866497efbe7a7679d6949b05b108f5e.zip |
XEEN: Cleanup of PowType enum names
-rw-r--r-- | engines/xeen/combat.cpp | 6 | ||||
-rw-r--r-- | engines/xeen/combat.h | 8 | ||||
-rw-r--r-- | engines/xeen/spells.cpp | 28 |
3 files changed, 21 insertions, 21 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp index 580c00216a..618b556b6b 100644 --- a/engines/xeen/combat.cpp +++ b/engines/xeen/combat.cpp @@ -70,8 +70,8 @@ static const int ATTACK_TYPE_FX[23] = { }; static const PowType MONSTER_SHOOT_POW[7] = { - POW_12, POW_SWORD_AND_DEATH, POW_FIREBALL, POW_MEGAVOLTS, - POW_COLD_RAY, POW_SPRAY, POW_ENERGY_BLAST + POW_MAGIC_ARROW, POW_SPARKLES, POW_FIREBALL, + POW_MEGAVOLTS, POW_COLD_RAY, POW_SPRAY, POW_ENERGY_BLAST }; static const int COMBAT_SHOOTING[4] = { 1, 1, 2, 3 }; @@ -552,7 +552,7 @@ void Combat::monstersAttack() { if (_gmonHit[idx] != -1) { monsterData = &map._monsterData[_gmonHit[idx]]; powNum = MONSTER_SHOOT_POW[monsterData->_attackType]; - if (powNum != POW_12) + if (powNum != POW_MAGIC_ARROW) break; } } diff --git a/engines/xeen/combat.h b/engines/xeen/combat.h index 2d531c08d9..3a79a2ea22 100644 --- a/engines/xeen/combat.h +++ b/engines/xeen/combat.h @@ -71,10 +71,10 @@ enum CombatMode { enum PowType { POW_INVALID = -1, POW_FIREBALL = 0, POW_INCINERATE = 1, POW_FIERY_FLAIL = 2, POW_LIGHTNING = 3, POW_MEGAVOLTS = 4, - POW_SPARKS = 5, POW_STOPPER_AND_IMPLOSION = 6, - POW_SLEEP_AND_MASTER = 7, POW_COLD_RAY = 8, POW_FROST2 = 9, - POW_SPRAY = 10, POW_ARROW = 11, POW_12 = 12, POW_ENERGY_BLAST = 13, - POW_SWORD_AND_DEATH = 14, POW_DEADLY_SWARM = 15 + POW_SPARKS = 5, POW_STOPPER = 6, POW_MAGIC_ORB = 7, + POW_COLD_RAY = 8, POW_FROST_WAVE = 9, POW_SPRAY = 10, + POW_ARROW = 11, POW_MAGIC_ARROW = 12, POW_ENERGY_BLAST = 13, + POW_SPARKLES = 14, POW_DEADLY_SWARM = 15 }; class XeenEngine; diff --git a/engines/xeen/spells.cpp b/engines/xeen/spells.cpp index b2ce89fc02..ff737d9e77 100644 --- a/engines/xeen/spells.cpp +++ b/engines/xeen/spells.cpp @@ -277,7 +277,7 @@ void Spells::beastMaster() { combat._damageType = DT_BEASTMASTER; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_SLEEP_AND_MASTER); + combat.rangedAttack(POW_MAGIC_ORB); } void Spells::bless() { @@ -378,7 +378,7 @@ void Spells::dancingSword() { combat._damageType = DT_PHYSICAL; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_SWORD_AND_DEATH); + combat.rangedAttack(POW_SPARKLES); } void Spells::dayOfProtection() { @@ -505,7 +505,7 @@ void Spells::dragonSleep() { combat._damageType = DT_DRAGONSLEEP; combat._rangeType = RT_SINGLE; sound.playFX(18); - combat.rangedAttack(POW_SLEEP_AND_MASTER); + combat.rangedAttack(POW_MAGIC_ORB); } void Spells::elementalStorm() { @@ -513,7 +513,7 @@ void Spells::elementalStorm() { Sound &sound = *_vm->_sound; static const int STORM_FX_LIST[4] = { 13, 14, 15, 17 }; static const PowType STORM_MA_LIST[4] = { - POW_FIREBALL, POW_SPARKS, POW_FROST2, POW_SPRAY + POW_FIREBALL, POW_SPARKS, POW_FROST_WAVE, POW_SPRAY }; combat._monsterDamage = 150; @@ -594,7 +594,7 @@ void Spells::fingerOfDeath() { combat._damageType = DT_FINGEROFDEATH; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_SWORD_AND_DEATH); + combat.rangedAttack(POW_SPARKLES); } void Spells::fireball() { @@ -631,7 +631,7 @@ void Spells::flyingFist() { combat._damageType = DT_PHYSICAL; combat._rangeType = RT_SINGLE; sound.playFX(18); - combat.rangedAttack(POW_SWORD_AND_DEATH); + combat.rangedAttack(POW_SPARKLES); } void Spells::frostbite() { @@ -653,7 +653,7 @@ void Spells::golemStopper() { combat._damageType = DT_GOLEMSTOPPER; combat._rangeType = RT_SINGLE; sound.playFX(16); - combat.rangedAttack(POW_STOPPER_AND_IMPLOSION); + combat.rangedAttack(POW_STOPPER); } void Spells::heroism() { @@ -693,7 +693,7 @@ void Spells::hypnotize() { combat._damageType = DT_HYPNOTIZE; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_SLEEP_AND_MASTER); + combat.rangedAttack(POW_MAGIC_ORB); } void Spells::identifyMonster() { @@ -715,7 +715,7 @@ void Spells::implosion() { combat._damageType = DT_ENERGY; combat._rangeType = RT_SINGLE; sound.playFX(18); - combat.rangedAttack(POW_STOPPER_AND_IMPLOSION); + combat.rangedAttack(POW_STOPPER); } void Spells::incinerate() { @@ -855,7 +855,7 @@ void Spells::massDistortion() { combat._damageType = DT_MASS_DISTORTION; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_STOPPER_AND_IMPLOSION); + combat.rangedAttack(POW_STOPPER); } void Spells::megaVolts() { @@ -912,7 +912,7 @@ void Spells::pain() { combat._damageType = DT_PHYSICAL; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_SWORD_AND_DEATH); + combat.rangedAttack(POW_SPARKLES); } void Spells::poisonVolley() { @@ -958,7 +958,7 @@ void Spells::prismaticLight() { combat._damageType = (DamageType)_vm->getRandomNumber(DT_PHYSICAL, DT_ENERGY); combat._rangeType = RT_ALL; sound.playFX(18); - combat.rangedAttack(POW_SWORD_AND_DEATH); + combat.rangedAttack(POW_SPARKLES); } void Spells::protectionFromElements() { @@ -1087,7 +1087,7 @@ void Spells::sleep() { combat._damageType = DT_SLEEP; combat._rangeType = RT_GROUP; sound.playFX(18); - combat.rangedAttack(POW_SLEEP_AND_MASTER); + combat.rangedAttack(POW_MAGIC_ORB); } void Spells::sparks() { @@ -1325,7 +1325,7 @@ void Spells::frostbite2() { combat._damageType = DT_COLD; combat._rangeType = RT_SINGLE; sound.playFX(15); - combat.rangedAttack(POW_FROST2); + combat.rangedAttack(POW_FROST_WAVE); } } // End of namespace Xeen |