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

Fixed build

Browse Source
This commit is contained in:
Subv
2012-02-14 13:53:33 -05:00
parent f8df838db9
commit ded43242eb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/ConditionMgr.cpp
+8 -8
View File
@@ -374,34 +374,34 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo,
std::map<uint32, bool> ElseGroupStore; std::map<uint32, bool> ElseGroupStore;
for (ConditionList::const_iterator i = conditions.begin(); i != conditions.end(); ++i) for (ConditionList::const_iterator i = conditions.begin(); i != conditions.end(); ++i)
{ {
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditionList condType: %u val1: %u", (*i)->mConditionType, (*i)->mConditionValue1); sLog->outDebug(LOG_FILTER_CONDITIONSYS, "ConditionMgr::IsPlayerMeetToConditionList condType: %u val1: %u", (*i)->ConditionType, (*i)->ConditionValue1);
if ((*i)->isLoaded()) if ((*i)->isLoaded())
{ {
std::map<uint32, bool>::const_iterator itr = ElseGroupStore.find((*i)->mElseGroup); std::map<uint32, bool>::const_iterator itr = ElseGroupStore.find((*i)->ElseGroup);
if (itr == ElseGroupStore.end()) if (itr == ElseGroupStore.end())
ElseGroupStore[(*i)->mElseGroup] = true; ElseGroupStore[(*i)->ElseGroup] = true;
else if (!(*itr).second) else if (!(*itr).second)
continue; continue;
if ((*i)->mReferenceId)//handle reference if ((*i)->ReferenceId)//handle reference
{ {
ConditionReferenceContainer::const_iterator ref = ConditionReferenceStore.find((*i)->mReferenceId); ConditionReferenceContainer::const_iterator ref = ConditionReferenceStore.find((*i)->ReferenceId);
if (ref != ConditionReferenceStore.end()) if (ref != ConditionReferenceStore.end())
{ {
if (!IsObjectMeetToConditionList(sourceInfo, (*ref).second)) if (!IsObjectMeetToConditionList(sourceInfo, (*ref).second))
ElseGroupStore[(*i)->mElseGroup] = false; ElseGroupStore[(*i)->ElseGroup] = false;
} }
else else
{ {
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "IsPlayerMeetToConditionList: Reference template -%u not found", sLog->outDebug(LOG_FILTER_CONDITIONSYS, "IsPlayerMeetToConditionList: Reference template -%u not found",
(*i)->mReferenceId);//checked at loading, should never happen (*i)->ReferenceId);//checked at loading, should never happen
} }
} }
else //handle normal condition else //handle normal condition
{ {
if (!(*i)->Meets(sourceInfo)) if (!(*i)->Meets(sourceInfo))
ElseGroupStore[(*i)->mElseGroup] = false; ElseGroupStore[(*i)->ElseGroup] = false;
} }
} }
} }