josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Move spelltarget table check to the start of the server to reduce log spams.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-25 16:50:01 -05:00
parent 43dbb89659
commit ddcc7d1c66
2 changed files with 70 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+3 -3
View File
@@ -1624,7 +1624,7 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType)
SpellScriptTarget::const_iterator upper = spellmgr.GetEndSpellScriptTarget(m_spellInfo->Id);
if(lower == upper)
{
sLog.outErrorDb("Spell (ID: %u) (caster Entry: %u) does not have record in `spell_script_target`", m_spellInfo->Id, m_caster->GetEntry());
sLog.outDebug("Spell (ID: %u) (caster Entry: %u) does not have record in `spell_script_target`", m_spellInfo->Id, m_caster->GetEntry());
if(IsPositiveSpell(m_spellInfo->Id))
return SearchNearbyTarget(range, SPELL_TARGETS_ALLY);
else
@@ -2000,7 +2000,7 @@ void Spell::SetTargetMap(uint32 i, uint32 cur)
}
else
{
sLog.outError( "SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id );
sLog.outDebug( "SPELL: unknown target coordinates for spell ID %u", m_spellInfo->Id );
Unit *target = NULL;
if(uint64 guid = m_caster->GetUInt64Value(UNIT_FIELD_TARGET))
target = ObjectAccessor::GetUnit(*m_caster, guid);
@@ -2170,7 +2170,7 @@ void Spell::SetTargetMap(uint32 i, uint32 cur)
SpellScriptTarget::const_iterator upper = spellmgr.GetEndSpellScriptTarget(m_spellInfo->Id);
if(lower == upper)
{
sLog.outErrorDb("Spell (ID: %u) (caster Entry: %u) does not have record in `spell_script_target`", m_spellInfo->Id, m_caster->GetEntry());
sLog.outDebug("Spell (ID: %u) (caster Entry: %u) does not have record in `spell_script_target`", m_spellInfo->Id, m_caster->GetEntry());
if(IsPositiveEffect(m_spellInfo->Id, i))
SearchAreaTarget(unitList, radius, pushType, SPELL_TARGETS_ALLY);
src/game/SpellMgr.cpp
+66 -11
View File
@@ -974,6 +974,42 @@ void SpellMgr::LoadSpellTargetPositions()
} while( result->NextRow() );
// Check all spells
for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
{
SpellEntry const * spellInfo = sSpellStore.LookupEntry(i);
if(!spellInfo)
continue;
bool found = false;
for(int j = 0; j < 3; ++j)
{
switch(spellInfo->EffectImplicitTargetA[j])
{
case TARGET_DST_DB:
found = true;
break;
}
if(found)
break;
switch(spellInfo->EffectImplicitTargetB[j])
{
case TARGET_DST_DB:
found = true;
break;
}
if(found)
break;
}
if(found)
{
SpellScriptTarget::const_iterator lower = spellmgr.GetBeginSpellScriptTarget(i);
SpellScriptTarget::const_iterator upper = spellmgr.GetEndSpellScriptTarget(i);
if(lower == upper)
sLog.outDetail("Spell (ID: %u) does not have record in `spell_target_position`", i);
}
}
delete result;
sLog.outString();
@@ -1796,8 +1832,7 @@ void SpellMgr::LoadSpellScriptTarget()
delete result;
// Check all spells
/* Disabled (lot errors at this moment)
for(uint32 i = 1; i < sSpellStore.nCount; ++i)
for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
{
SpellEntry const * spellInfo = sSpellStore.LookupEntry(i);
if(!spellInfo)
@@ -1806,19 +1841,39 @@ void SpellMgr::LoadSpellScriptTarget()
bool found = false;
for(int j = 0; j < 3; ++j)
{
if( spellInfo->EffectImplicitTargetA[j] == TARGET_UNIT_NEARBY_ENTRY || spellInfo->EffectImplicitTargetA[j] != TARGET_UNIT_CASTER && spellInfo->EffectImplicitTargetB[j] == TARGET_UNIT_NEARBY_ENTRY )
switch(spellInfo->EffectImplicitTargetA[j])
{
SpellScriptTarget::const_iterator lower = spellmgr.GetBeginSpellScriptTarget(spellInfo->Id);
SpellScriptTarget::const_iterator upper = spellmgr.GetEndSpellScriptTarget(spellInfo->Id);
case TARGET_UNIT_AREA_ENTRY_SRC:
case TARGET_UNIT_AREA_ENTRY_DST:
case TARGET_UNIT_NEARBY_ENTRY:
case TARGET_DST_NEARBY_ENTRY:
case TARGET_UNIT_CONE_ENTRY:
found = true;
break;
}
if(found)
break;
switch(spellInfo->EffectImplicitTargetB[j])
{
case TARGET_UNIT_AREA_ENTRY_SRC:
case TARGET_UNIT_AREA_ENTRY_DST:
case TARGET_UNIT_NEARBY_ENTRY:
case TARGET_DST_NEARBY_ENTRY:
case TARGET_UNIT_CONE_ENTRY:
found = true;
break;
}
if(found)
break;
}
if(found)
{
SpellScriptTarget::const_iterator lower = spellmgr.GetBeginSpellScriptTarget(i);
SpellScriptTarget::const_iterator upper = spellmgr.GetEndSpellScriptTarget(i);
if(lower == upper)
{
sLog.outErrorDb("Spell (ID: %u) has effect EffectImplicitTargetA/EffectImplicitTargetB = %u (TARGET_UNIT_NEARBY_ENTRY), but does not have record in `spell_script_target`",spellInfo->Id,TARGET_UNIT_NEARBY_ENTRY);
break; // effects of spell
sLog.outDetail("Spell (ID: %u) does not have record in `spell_script_target`", i);
}
}
}
}
*/
sLog.outString();
sLog.outString(">> Loaded %u Spell Script Targets", count);