From dddacab0ddfeeab7c539ba38ed3eda1f99caa0f3 Mon Sep 17 00:00:00 2001 From: balrok Date: Mon, 10 Aug 2009 21:25:05 +0200 Subject: [PATCH] [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 --- src/game/SpellMgr.cpp | 12 ++++++------ src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index dbb15f434..3c3c1a31d 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2490,17 +2490,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 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1597c9c83..5bb0c0c8e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8344" + #define REVISION_NR "8345" #endif // __REVISION_NR_H__