diff options
| author | silinoron <none@none> | 2010-08-22 21:07:18 -0700 |
|---|---|---|
| committer | silinoron <none@none> | 2010-08-22 21:07:18 -0700 |
| commit | ccc2a83510c2dcdcaba1c9c1f1778b8f171e0c4c (patch) | |
| tree | 655f84305ce0c670bc8d558047825660f4b11987 /src/server/game | |
| parent | 5cbae843d58431237a270a0960a5d0c324d5cb1e (diff) | |
* Some consistency changes.
* Move spell 6962 to spell scripts and make sure to set deathstate.
--HG--
branch : trunk
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 32 |
2 files changed, 2 insertions, 34 deletions
diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 138469477db..5afd4c04547 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -145,11 +145,11 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z) distance /= 4; break; case 15: - angle = i_cur_angle + static_cast<float>(M_PI*3/4.0f); + angle = i_cur_angle + static_cast<float>(M_PI*3/4); distance /= 2; break; case 16: - angle = i_cur_angle - static_cast<float>(M_PI*3/4.0f); + angle = i_cur_angle - static_cast<float>(M_PI*3/4); distance /= 2; break; case 17: diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 6c14c46348b..a7d2dfbacf1 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4624,38 +4624,6 @@ void Spell::EffectScriptEffect(uint32 effIndex) { switch(m_spellInfo->Id) { - case 6962: - { - if (m_caster->GetTypeId() != TYPEID_PLAYER) - return; - - Player* plr = m_caster->ToPlayer(); - if (plr && plr->GetLastPetNumber()) - { - PetType NewPetType = (plr->getClass() == CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET; - if (Pet* NewPet = new Pet(plr,NewPetType)) - { - if (NewPet->LoadPetFromDB(plr, 0, plr->GetLastPetNumber(), true)) - { - NewPet->SetHealth(NewPet->GetMaxHealth()); - NewPet->SetPower(NewPet->getPowerType(),NewPet->GetMaxPower(NewPet->getPowerType())); - - switch (NewPet->GetEntry()) - { - case 11859: - case 89: - NewPet->SetEntry(416); - break; - default: - break; - } - } - else - delete NewPet; - } - } - return; - } // Glyph of Backstab case 63975: { |