From b0145e3b39c57bbbec22a3f280c9f37373f4b989 Mon Sep 17 00:00:00 2001 From: Matthew Goff Date: Sat, 11 Feb 2012 22:26:53 +0000 Subject: Core/Quests: Correct use of parenthesis in IsAutoComplete and IsAutoAccept Closes #5195 --- src/server/game/Conditions/ConditionMgr.cpp | 2 +- src/server/game/Quests/QuestDef.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 76ee1208752..6f380bb5d8a 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -319,7 +319,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) } case CONDITION_PHASEMASK: { - condMeets = (bool)(object->GetPhaseMask() & mConditionValue1); + condMeets = object->GetPhaseMask() & mConditionValue1; break; } default: diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 18340ea224b..173df8dc809 100755 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -212,12 +212,12 @@ int32 Quest::GetRewOrReqMoney() const bool Quest::IsAutoAccept() const { - return sWorld->getBoolConfig(CONFIG_QUEST_IGNORE_AUTO_ACCEPT) ? false : Flags & QUEST_FLAGS_AUTO_ACCEPT; + return sWorld->getBoolConfig(CONFIG_QUEST_IGNORE_AUTO_ACCEPT) ? false : (Flags & QUEST_FLAGS_AUTO_ACCEPT); } bool Quest::IsAutoComplete() const { - return sWorld->getBoolConfig(CONFIG_QUEST_IGNORE_AUTO_COMPLETE) ? false : Method == 0 || HasFlag(QUEST_FLAGS_AUTOCOMPLETE); + return sWorld->getBoolConfig(CONFIG_QUEST_IGNORE_AUTO_COMPLETE) ? false : (Method == 0 || HasFlag(QUEST_FLAGS_AUTOCOMPLETE)); } bool Quest::IsAllowedInRaid() const -- cgit v1.2.3