aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlaymoira <none@none>2009-03-15 19:25:44 +0100
committerBlaymoira <none@none>2009-03-15 19:25:44 +0100
commitccefda0578a6f436eb1a184de95083d18e13b606 (patch)
tree4dd9602698d6fc3d31c89ad5d2c6d8fbbb9b1ef5 /src
parentb41b611ba7e53382be8247b7b6f0dc5c350bb7c3 (diff)
*Rename some summon types
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SharedDefines.h6
-rw-r--r--src/game/Spell.cpp4
-rw-r--r--src/game/SpellEffects.cpp6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 1f464b17a81..e48072c614b 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -2190,9 +2190,9 @@ enum SummonType
SUMMON_TYPE_CRITTER2 = 407,
SUMMON_TYPE_CRITTER3 = 307,
SUMMON_TYPE_UNKNOWN5 = 409,
- SUMMON_TYPE_POSESSED3 = 427,
- SUMMON_TYPE_POSESSED2 = 428,
- SUMMON_TYPE_WILD2 = 429,
+ SUMMON_TYPE_RACE_CONTROLLER = 427,
+ SUMMON_TYPE_STEAM_TONK = 428,
+ SUMMON_TYPE_FROZEN_EARTH = 429,
SUMMON_TYPE_FORCE_OF_NATURE = 669,
SUMMON_TYPE_LIGHTWELL = 1141,
SUMMON_TYPE_FERAL_SPIRIT = 1161
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index fb80819fcc0..eb0f7ad5af3 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4210,8 +4210,8 @@ uint8 Spell::CanCast(bool strict)
switch(m_spellInfo->EffectMiscValueB[i])
{
case SUMMON_TYPE_POSESSED:
- case SUMMON_TYPE_POSESSED2:
- case SUMMON_TYPE_POSESSED3:
+ case SUMMON_TYPE_RACE_CONTROLLER:
+ case SUMMON_TYPE_STEAM_TONK:
case SUMMON_TYPE_DEMON:
case SUMMON_TYPE_SUMMON:
{
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index f51c83ef441..0c5e55d3fa8 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3371,8 +3371,8 @@ void Spell::EffectSummonType(uint32 i)
EffectSummonGuardian(i);
break;
case SUMMON_TYPE_POSESSED:
- case SUMMON_TYPE_POSESSED2:
- case SUMMON_TYPE_POSESSED3:
+ case SUMMON_TYPE_STEAM_TONK:
+ case SUMMON_TYPE_RACE_CONTROLLER:
EffectSummonPossessed(i);
break;
case SUMMON_TYPE_FORCE_OF_NATURE:
@@ -3380,7 +3380,7 @@ void Spell::EffectSummonType(uint32 i)
EffectSummonGuardian(i);
break;
case SUMMON_TYPE_WILD:
- case SUMMON_TYPE_WILD2:
+ case SUMMON_TYPE_FROZEN_EARTH:
case SUMMON_TYPE_LIGHTWELL:
EffectSummonWild(i);
break;