Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: more cherrypick followups

Browse Source
This commit is contained in:
Ovahlord
2019-04-26 18:58:58 +02:00
parent 1f15fe5096
commit d9c809d828
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/AI/SmartScripts/SmartAI.h
View File

@@ -73,12 +73,9 @@ class TC_GAME_API SmartAI : public CreatureAI
void WaypointReached(uint32 nodeId, uint32 pathId) override;
void WaypointPathEnded(uint32 nodeId, uint32 pathId) override;
void SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker);
void SetTimedActionList(SmartScriptHolder& e, uint32 entry, Unit* invoker);
SmartScript* GetScript() { return &mScript; }
// Called when creature is spawned or respawned
void JustAppeared() override;
// Called at reaching home after evade, InitializeAI(), EnterEvadeMode() for resetting variables
void JustReachedHome() override;
@@ -267,7 +264,7 @@ class TC_GAME_API SmartGameObjectAI : public GameObjectAI
void Destroyed(Player* player, uint32 eventId) override;
void SetData(uint32 id, uint32 value, Unit* invoker);
void SetData(uint32 id, uint32 value) override { SetData(id, value, nullptr); }
void SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker);
void SetTimedActionList(SmartScriptHolder& e, uint32 entry, Unit* invoker);
void OnGameEvent(bool start, uint16 eventId) override;
void OnLootStateChanged(uint32 state, Unit* unit) override;
void EventInform(uint32 eventId) override;

3
src/server/game/AI/SmartScripts/SmartScript.h
View File

@@ -86,8 +86,7 @@ class TC_GAME_API SmartScript
void OnReset();
void ResetBaseObject();
//TIMED_ACTIONLIST (script type 9 aka script9)
void SetScript9(SmartScriptHolder& e, uint32 entry, Unit* invoker);
void SetTimedActionList(SmartScriptHolder& e, uint32 entry, Unit* invoker);
Unit* GetLastInvoker(Unit* invoker = nullptr);
ObjectGuid mLastInvoker;
typedef std::unordered_map<uint32, uint32> CounterMap;