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 +++--- src/server/game/Scripting/ScriptMgr.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game/Scripting') 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) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 443d7f28653..61d3119b500 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -573,7 +573,7 @@ class ConditionScript : public ScriptObject bool IsDatabaseBound() const { return true; } // Called when a single condition is checked for a player. - virtual bool OnConditionCheck(Condition* /*condition*/, Player* /*player*/, Unit* /*targetOverride*/) { return true; } + virtual bool OnConditionCheck(Condition* /*condition*/, Player* /*player*/, Unit* /*invoker*/) { return true; } }; class VehicleScript : public ScriptObject @@ -889,7 +889,7 @@ class ScriptMgr public: /* ConditionScript */ - bool OnConditionCheck(Condition* condition, Player* player, Unit* targetOverride); + bool OnConditionCheck(Condition* condition, Player* player, Unit* invoker); public: /* VehicleScript */ -- cgit v1.2.3