From 5fb608fec605e28d526a72f4ae4ec1a701af65bf Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 13 Sep 2009 20:48:53 +0400 Subject: [PATCH] [8493] Avoid unexpected multiply error messages at wrong `quest_template`.`RewSpell*` --- src/game/ObjectMgr.cpp | 14 ++++---------- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 65944c5a9..8c810c432 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -3620,20 +3620,17 @@ void ObjectMgr::LoadQuests() qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell); qinfo->RewSpell = 0; // no spell reward will display for this quest } - - if(!SpellMgr::IsSpellValid(spellInfo)) + else if(!SpellMgr::IsSpellValid(spellInfo)) { sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u is broken, quest will not have a spell reward.", qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell); qinfo->RewSpell = 0; // no spell reward will display for this quest } - - if(GetTalentSpellCost(qinfo->RewSpell)) + else if(GetTalentSpellCost(qinfo->RewSpell)) { sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u is talent, quest will not have a spell reward.", qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell); qinfo->RewSpell = 0; // no spell reward will display for this quest - continue; } } @@ -3647,20 +3644,17 @@ void ObjectMgr::LoadQuests() qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast); qinfo->RewSpellCast = 0; // no spell will be casted on player } - - if(!SpellMgr::IsSpellValid(spellInfo)) + else if(!SpellMgr::IsSpellValid(spellInfo)) { sLog.outErrorDb("Quest %u has `RewSpellCast` = %u but spell %u is broken, quest will not have a spell reward.", qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast); qinfo->RewSpellCast = 0; // no spell will be casted on player } - - if(GetTalentSpellCost(qinfo->RewSpellCast)) + else if(GetTalentSpellCost(qinfo->RewSpellCast)) { sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u is talent, quest will not have a spell reward.", qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast); qinfo->RewSpellCast = 0; // no spell will be casted on player - continue; } } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b8400b991..a7e353152 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 "8492" + #define REVISION_NR "8493" #endif // __REVISION_NR_H__