From ffcc3d817ef5ca5accf8887b4a4296f394b599dd Mon Sep 17 00:00:00 2001 From: QAston Date: Wed, 24 Dec 2008 22:21:45 +0100 Subject: [PATCH] *Fix error message on missing spell_required table. --HG-- branch : trunk --- src/game/SpellMgr.cpp | 14 +-- win/VC80/TrinityCore.vcproj | 202 ++++++++++++++++++------------------ 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 1e9ae3531dd..41faea5b8fb 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1332,14 +1332,14 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool // return true; //use data of highest rank spell(needed for spells which ranks have different effects) - SpellEntry const *spellInfo1=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_1)); - SpellEntry const *spellInfo2=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_2)); + spellInfo_1=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_1)); + spellInfo_2=sSpellStore.LookupEntry(GetLastSpellInChain(spellId_2)); //if spells have exactly the same effect they cannot stack for(uint32 i = 0; i < 3; ++i) - if(spellInfo1->Effect[i] != spellInfo2->Effect[i] - || spellInfo1->EffectApplyAuraName[i] != spellInfo2->EffectApplyAuraName[i] - || spellInfo1->EffectMiscValue[i] != spellInfo2->EffectMiscValue[i]) // paladin resist aura + if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i] + || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i] + || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i]) // paladin resist aura return false; // need itemtype check? need an example to add that check return true; @@ -1430,8 +1430,8 @@ void SpellMgr::LoadSpellRequired() bar.step(); sLog.outString(); - sLog.outString( ">> Loaded 0 spell chain records" ); - sLog.outErrorDb("`spell_chains` table is empty!"); + sLog.outString( ">> Loaded 0 spell required records" ); + sLog.outErrorDb("`spell_required` table is empty!"); return; } uint32 rows = 0; diff --git a/win/VC80/TrinityCore.vcproj b/win/VC80/TrinityCore.vcproj index 6209bd3f9aa..6a1051581b7 100644 --- a/win/VC80/TrinityCore.vcproj +++ b/win/VC80/TrinityCore.vcproj @@ -118,107 +118,6 @@ CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName) copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist " /> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +