From 962f6d7988b9003e550f6745be7cff812e9d8efa Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 10 Feb 2018 16:43:01 -0300 Subject: Core/Spells: rework part 5: GameObject casting Closes #21330 Closes #18885 Ref #18752 (cherry picked from commit 45c5e1b9d63796d168339a44f63418f220cf2403) --- src/server/game/AI/SmartScripts/SmartAI.cpp | 4 ++-- src/server/game/AI/SmartScripts/SmartAI.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/AI/SmartScripts') diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 943748e6be2..4dc48f45395 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -1025,9 +1025,9 @@ void SmartGameObjectAI::QuestReward(Player* player, Quest const* quest, LootItem } // Called when the gameobject is destroyed (destructible buildings only). -void SmartGameObjectAI::Destroyed(Player* player, uint32 eventId) +void SmartGameObjectAI::Destroyed(WorldObject* attacker, uint32 eventId) { - GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, player, eventId, 0, false, nullptr, me); + GetScript()->ProcessEventsFor(SMART_EVENT_DEATH, attacker ? attacker->ToUnit() : nullptr, eventId, 0, false, nullptr, me); } void SmartGameObjectAI::SetData(uint32 id, uint32 value, Unit* invoker) diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 591b10ba70f..f0967af9109 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -262,7 +262,7 @@ class TC_GAME_API SmartGameObjectAI : public GameObjectAI bool GossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, char const* code) override; void QuestAccept(Player* player, Quest const* quest) override; void QuestReward(Player* player, Quest const* quest, LootItemType type, uint32 opt) override; - void Destroyed(Player* player, uint32 eventId) override; + void Destroyed(WorldObject* attacker, uint32 eventId) override; void SetData(uint32 id, uint32 value, Unit* invoker); void SetData(uint32 id, uint32 value) override { SetData(id, value, nullptr); } void SetTimedActionList(SmartScriptHolder& e, uint32 entry, Unit* invoker); -- cgit v1.2.3