From d2af10618f14422f2579f7f5f19abfa410e6f9a2 Mon Sep 17 00:00:00 2001 From: Rat Date: Fri, 24 Sep 2010 18:16:29 +0200 Subject: Core/ConditionMgr: added placeholder for CONDITION_GUID renamed targetOverride to invoker removed targetOverride code (had no use) --HG-- branch : trunk --- src/server/game/Scripting/ScriptMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index fc3061b04e7..76f10c144e5 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -930,14 +930,14 @@ void ScriptMgr::OnAuctionExpire(AuctionHouseObject* ah, AuctionEntry* entry) FOREACH_SCRIPT(AuctionHouseScript)->OnAuctionExpire(ah, entry); } -bool ScriptMgr::OnConditionCheck(Condition* condition, Player* player, Unit* targetOverride) +bool ScriptMgr::OnConditionCheck(Condition* condition, Player* player, Unit* invoker) { ASSERT(condition); ASSERT(player); - // targetOverride can be NULL. + // invoker can be NULL. GET_SCRIPT_RET(ConditionScript, condition->mScriptId, tmpscript, true); - return tmpscript->OnConditionCheck(condition, player, targetOverride); + return tmpscript->OnConditionCheck(condition, player, invoker); } void ScriptMgr::OnInstall(Vehicle* veh) -- cgit v1.2.3