aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptMgr.cpp
diff options
context:
space:
mode:
authorRat <none@none>2010-09-24 18:16:29 +0200
committerRat <none@none>2010-09-24 18:16:29 +0200
commitd2af10618f14422f2579f7f5f19abfa410e6f9a2 (patch)
treec35b38a1e531df80ca44327299ad268f9047402f /src/server/game/Scripting/ScriptMgr.cpp
parentb8cc05f747744ecea6ef65a23699cb9db3999e80 (diff)
Core/ConditionMgr: added placeholder for CONDITION_GUID
renamed targetOverride to invoker removed targetOverride code (had no use) --HG-- branch : trunk
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp6
1 files changed, 3 insertions, 3 deletions
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)