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:
QAston
2012-02-10 15:43:19 +01:00
parent 676151f6ac
commit f2f1150761
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/ConditionMgr.cpp
+3 -4
View File
@@ -163,7 +163,6 @@ bool Condition::Meets(WorldObject* object, WorldObject* invoker)
} }
case CONDITION_SPELL_SCRIPT_TARGET: case CONDITION_SPELL_SCRIPT_TARGET:
condMeets = true;//spell target condition is handled in spellsystem, here it is always true condMeets = true;//spell target condition is handled in spellsystem, here it is always true
refId = 0;//cant have references! use CONDITION_SOURCE_TYPE_SPELL for it
break; break;
case CONDITION_CREATURE_TARGET: case CONDITION_CREATURE_TARGET:
{ {
@@ -284,11 +283,11 @@ bool Condition::Meets(WorldObject* object, WorldObject* invoker)
condMeets = !condMeets; condMeets = !condMeets;
if (Player* player = object->ToPlayer()) if (Player* player = object->ToPlayer())
if (sendErrorMsg && ErrorTextd && (!condMeets || !refMeets))//send special error from DB if (sendErrorMsg && ErrorTextd && (!condMeets))//send special error from DB
player->m_ConditionErrorMsgId = ErrorTextd; player->m_ConditionErrorMsgId = ErrorTextd;
bool script = sScriptMgr->OnConditionCheck(this, object, invoker); // Returns true by default. bool script = sScriptMgr->OnConditionCheck(this, object, invoker); // Returns true by default.
return condMeets && refMeets && script; return condMeets && script;
} }
ConditionMgr::ConditionMgr() ConditionMgr::ConditionMgr()
@@ -1477,7 +1476,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
} }
if (cond->mConditionValue2) if (cond->mConditionValue2)
{ {
sLog->outErrorDb("DrunkState condition has useless data in value2 (%u)!", cond->mConditionValue3); sLog->outErrorDb("DrunkState condition has useless data in value2 (%u)!", cond->mConditionValue2);
return false; return false;
} }
if (cond->mConditionValue3) if (cond->mConditionValue3)