Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed stupid/not needed file Spellid.h.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-02-15 18:23:39 +01:00
parent 922b368aac
commit bcd4a48328
31 changed files with 231 additions and 140390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/ObjectMgr.cpp
View File

@@ -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;