From 2ea8cbb4f1f1d1b1f7b84ea8c10d8d7c9f969fa0 Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Thu, 20 Aug 2009 22:37:19 +0200 Subject: Merge [SD2] r1356 Move HasFollowState() to public and move related Add/RemoveFollowState() to private (not intended that script can alter state directly) r1357 Add faint and revive for npc_ringo --HG-- branch : trunk --- src/bindings/scripts/base/follower_ai.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/bindings/scripts/base') diff --git a/src/bindings/scripts/base/follower_ai.h b/src/bindings/scripts/base/follower_ai.h index 1513cd4c49c..372fe38a581 100644 --- a/src/bindings/scripts/base/follower_ai.h +++ b/src/bindings/scripts/base/follower_ai.h @@ -43,16 +43,17 @@ class TRINITY_DLL_DECL FollowerAI : public ScriptedAI void SetFollowPaused(bool bPaused); //if special event require follow mode to hold/resume during the follow - protected: bool HasFollowState(uint32 uiFollowState) { return (m_uiFollowState & uiFollowState); } - void AddFollowState(uint32 uiFollowState) { m_uiFollowState |= uiFollowState; } - void RemoveFollowState(uint32 uiFollowState) { m_uiFollowState &= ~uiFollowState; } + protected: void SetFollowComplete(bool bWithEndEvent = false); Player* GetLeaderForFollower(); private: + void AddFollowState(uint32 uiFollowState) { m_uiFollowState |= uiFollowState; } + void RemoveFollowState(uint32 uiFollowState) { m_uiFollowState &= ~uiFollowState; } + uint64 m_uiLeaderGUID; uint32 m_uiUpdateFollowTimer; uint32 m_uiFollowState; -- cgit v1.2.3