Core/ConditionMgr: added placeholder for CONDITION_GUID
renamed targetOverride to invoker removed targetOverride code (had no use) --HG-- branch : trunk
This commit is contained in:
1 parent
b8cc05f747
commit
d2af10618f
4 files changed
+17
-20
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
Reference in new issue
Block a user