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

1 files changed, 4 insertions, 3 deletions

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;