aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-12 20:38:24 -0500
committermegamage <none@none>2009-08-12 20:38:24 -0500
commit8ee1e20acddd999399ad205050eb4a63052ca394 (patch)
tree86b5c6ec399925b55459ad2a43a3cafe4c6d8db6 /src
parentd1a5689b6520d243487ce29335905a6e7b5f883d (diff)
[8345] corrected startup-checks for spell_area table
old problem was that, for example a single spell couldn't be cast at aura OR quest (so 2 entries in this table) .. will be now possible Signed-off-by: balrok <der-coole-carl@gmx.net> --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellMgr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 81fa0b93123..d22e98fd9ec 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2410,17 +2410,17 @@ void SpellMgr::LoadSpellAreas()
SpellAreaMapBounds sa_bounds = GetSpellAreaMapBounds(spellArea.spellId);
for(SpellAreaMap::const_iterator itr = sa_bounds.first; itr != sa_bounds.second; ++itr)
{
- if(spellArea.spellId && itr->second.spellId && spellArea.spellId != itr->second.spellId)
+ if (spellArea.spellId != itr->second.spellId)
continue;
- if(spellArea.areaId && itr->second.areaId && spellArea.areaId!= itr->second.areaId)
+ if (spellArea.areaId != itr->second.areaId)
continue;
- if(spellArea.questStart && itr->second.questStart && spellArea.questStart!= itr->second.questStart)
+ if (spellArea.questStart != itr->second.questStart)
continue;
- if(spellArea.auraSpell && itr->second.auraSpell && spellArea.auraSpell!= itr->second.auraSpell)
+ if (spellArea.auraSpell != itr->second.auraSpell)
continue;
- if(spellArea.raceMask && itr->second.raceMask && (spellArea.raceMask & itr->second.raceMask)==0)
+ if ((spellArea.raceMask & itr->second.raceMask) == 0)
continue;
- if(spellArea.gender != GENDER_NONE && itr->second.gender != GENDER_NONE && spellArea.gender!= itr->second.gender)
+ if (spellArea.gender != itr->second.gender)
continue;
// duplicate by requirements