diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-07-22 21:22:05 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-07-22 21:22:05 +0200 |
| commit | 74e2d981ac1af4b0e9101c9e5e8a5bf23fd60566 (patch) | |
| tree | 7a84fc4ffe636eb031f4498da384f23a441752f2 /src/server/scripts | |
| parent | 0a4f18fab380ce210a215374b4df8f241ea50aab (diff) | |
Core/GameObject: Refactored destructible building handling, properly implemented spell effect repair
Diffstat (limited to 'src/server/scripts')
| -rwxr-xr-x | src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index ffe940acb27..bdccc540bb6 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -204,7 +204,7 @@ class npc_announcer_toc10 : public CreatureScript return true; if (GameObject* floor = GameObject::GetGameObject(*player, instanceScript->GetData64(GO_ARGENT_COLISEUM_FLOOR))) - floor->TakenDamage(1000000); + floor->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); creature->CastSpell(creature, 69016, false); @@ -319,7 +319,7 @@ class boss_lich_king_toc : public CreatureScript break; case 5080: if (GameObject* pGoFloor = m_pInstance->instance->GetGameObject(m_pInstance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) - pGoFloor->TakenDamage(1000000); + pGoFloor->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); me->CastSpell(me, 69016, false); if (m_pInstance) { diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 41c7a3898de..5d8584e3cd1 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -983,7 +983,7 @@ class spell_gen_seaforium_blast : public SpellScriptLoader void Register() { - OnEffect += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_WMO_DAMAGE); + OnEffect += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; |
