diff options
| author | n0n4m3 <none@none> | 2010-02-15 18:23:39 +0100 |
|---|---|---|
| committer | n0n4m3 <none@none> | 2010-02-15 18:23:39 +0100 |
| commit | bcd4a48328ddde592a440983b624a1e7d676d674 (patch) | |
| tree | 3ccb9410469feb46ca9c6b41ce8228200a86a27f /src/game/ObjectMgr.cpp | |
| parent | 922b368aac117cf38646f27c77610bea396fa488 (diff) | |
Removed stupid/not needed file Spellid.h.
--HG--
branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
| -rw-r--r-- | src/game/ObjectMgr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 77048650708..c83026c946e 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -46,7 +46,6 @@ #include "WaypointManager.h" #include "InstanceData.h" //for condition_instance_data #include "GossipDef.h" -#include "SpellId.h" INSTANTIATE_SINGLETON_1(ObjectMgr); @@ -2132,7 +2131,7 @@ void ObjectMgr::LoadItemPrototypes() } // special format - if ((proto->Spells[0].SpellId == SPELL_LEARNING_483) || (proto->Spells[0].SpellId == SPELL_LEARNING_55884)) + if ((proto->Spells[0].SpellId == 483) || (proto->Spells[0].SpellId == 55884)) { // spell_1 if (proto->Spells[0].SpellTrigger != ITEM_SPELLTRIGGER_ON_USE) @@ -2169,7 +2168,7 @@ void ObjectMgr::LoadItemPrototypes() const_cast<ItemPrototype*>(proto)->Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE; } // allowed only in special format - else if ((proto->Spells[1].SpellId==SPELL_LEARNING_483) || (proto->Spells[1].SpellId == SPELL_LEARNING_55884)) + else if ((proto->Spells[1].SpellId==483) || (proto->Spells[1].SpellId == 55884)) { sLog.outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%u)",i,1+1,proto->Spells[1].SpellId); const_cast<ItemPrototype*>(proto)->Spells[0].SpellId = 0; @@ -2215,7 +2214,7 @@ void ObjectMgr::LoadItemPrototypes() const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0; } // allowed only in special format - else if ((proto->Spells[j].SpellId==SPELL_LEARNING_483) || (proto->Spells[j].SpellId==SPELL_LEARNING_55884)) + else if ((proto->Spells[j].SpellId == 483) || (proto->Spells[j].SpellId == 55884)) { sLog.outErrorDb("Item (Entry: %u) has broken spell in spellid_%d (%u)",i,j+1,proto->Spells[j].SpellId); const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0; |