From b0fe236265465a0f39aa98a8cee2916d1ccfaa02 Mon Sep 17 00:00:00 2001 From: QAston Date: Tue, 26 Jul 2011 23:09:28 +0200 Subject: Core: Use new SpellInfo class in core. Sadly, this commit is not compatibile with some of the custom code. To make your code work again you may need to change: *SpellEntry is now SpellInfo *GetSpellProto is now GetSpellInfo *SpellEntry::Effect*[effIndex] is now avalible under SpellInfo.Effects[effIndex].* *sSpellStore.LookupEntry is no longer valid, use sSpellMgr->GetSpellInfo() *SpellFunctions from SpellMgr.h like DoSpellStuff(spellId) are now: spellInfo->DoStuff() *SpellMgr::CalculateEffectValue and similar functions are now avalible in SpellEffectInfo class. *GET_SPELL macro is removed, code which used it is moved to SpellMgr::LoadDbcDataCorrections *code which affected dbc data in SpellMgr::LoadSpellCustomAttr is now moved to LoadDbcDataCorrections --- .../ScarletMonastery/boss_headless_horseman.cpp | 17 +++++------------ .../ScarletMonastery/boss_mograine_and_whitemane.cpp | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'src/server/scripts/EasternKingdoms/ScarletMonastery') diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 95179a92d29..5262ed6620c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -143,13 +143,6 @@ public: mob_wisp_invisAI(Creature* c) : ScriptedAI(c) { Creaturetype = delay = spell = spell2 = 0; - //that's hack but there are no info about range of this spells in dbc - SpellEntry *wisp = GET_SPELL(SPELL_WISP_BLUE); - if (wisp) - wisp->rangeIndex = 6; //100 yards - SpellEntry *port = GET_SPELL(SPELL_WISP_FLIGHT_PORT); - if (port) - port->rangeIndex = 6; } uint32 Creaturetype; @@ -183,7 +176,7 @@ public: DoCast(me, spell); } - void SpellHit(Unit* /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellInfo *spell) { if (spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4) me->SetDisplayId(2027); @@ -290,7 +283,7 @@ public: } } - void SpellHit(Unit* caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) { if (!withbody) return; @@ -534,7 +527,7 @@ public: return NULL; } - void SpellHitTarget(Unit* unit, const SpellEntry* spell) + void SpellHitTarget(Unit* unit, const SpellInfo* spell) { if (spell->Id == SPELL_CONFLAGRATION && unit->HasAura(SPELL_CONFLAGRATION)) SaySound(SAY_CONFLAGRATION, unit); @@ -553,7 +546,7 @@ public: pInstance->SetData(DATA_HORSEMAN_EVENT, DONE); } - void SpellHit(Unit* caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) { if (withhead) return; @@ -781,7 +774,7 @@ public: void EnterCombat(Unit* /*who*/){} - void SpellHit(Unit* /*caster*/, const SpellEntry *spell) + void SpellHit(Unit* /*caster*/, const SpellInfo *spell) { if (spell->Id == SPELL_SPROUTING) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index a21b5f00a22..a10f3ee4a5c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -157,7 +157,7 @@ public: } } - void SpellHit(Unit* /*who*/, const SpellEntry* pSpell) + void SpellHit(Unit* /*who*/, const SpellInfo* pSpell) { //When hit with ressurection say text if (pSpell->Id == SPELL_SCARLETRESURRECTION) -- cgit v1.2.3