diff options
| author | megamage <none@none> | 2009-06-01 15:02:58 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-01 15:02:58 -0500 |
| commit | 999b49201a61f0ca86fbe84be58d462a0dc80461 (patch) | |
| tree | 082de208272d57f5a6be417681209b9be31066d6 /src | |
| parent | 9cadc5d1476e6aa3253d5f581cc1ef0fabb04a61 (diff) | |
| parent | dd9939942413318c773ad126492e7731fe17a7b7 (diff) | |
*Merge. (spell parts skipped)
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp | 5 | ||||
| -rw-r--r-- | src/game/Object.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp index e753d0b6047..ec7778d7a0d 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp @@ -46,8 +46,8 @@ enum Spells SPELL_CORROSION = 45866, SPELL_GAS_NOVA = 45855, SPELL_ENCAPSULATE_CHANNEL = 45661, - SPELL_ENCAPSULATE_EFFECT = 45665, - SPELL_ENCAPSULATE_AOE = 45662, + // SPELL_ENCAPSULATE_EFFECT = 45665, + // SPELL_ENCAPSULATE_AOE = 45662, //Flight phase SPELL_VAPOR_SELECT = 45391, // fel to player, force cast 45392, 50000y selete target @@ -474,7 +474,6 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI if(Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) { m_creature->CastSpell(target, SPELL_ENCAPSULATE_CHANNEL, false); - target->CastSpell(target, SPELL_ENCAPSULATE_EFFECT, true);// linked aura, need core patch to remove this hack Timer[EVENT_ENCAPSULATE] = 25000 + rand()%5 * 1000; }break; case EVENT_FLIGHT: diff --git a/src/game/Object.h b/src/game/Object.h index 50533e4a509..0e08247aece 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -431,7 +431,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object float GetObjectSize() const { - return ( m_valuesCount > UNIT_FIELD_BOUNDINGRADIUS ) ? m_floatValues[UNIT_FIELD_BOUNDINGRADIUS] : DEFAULT_WORLD_OBJECT_SIZE; + return ( m_valuesCount > UNIT_FIELD_COMBATREACH ) ? m_floatValues[UNIT_FIELD_COMBATREACH] : DEFAULT_WORLD_OBJECT_SIZE; } bool IsPositionValid() const; void UpdateGroundPositionZ(float x, float y, float &z) const; |