diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h
index e4cd7e65d..a775f71ba 100644
--- a/src/game/ConfusedMovementGenerator.h
+++ b/src/game/ConfusedMovementGenerator.h
@@ -38,7 +38,7 @@ class MANGOS_DLL_SPEC ConfusedMovementGenerator
         void Reset(T &);
         bool Update(T &, const uint32 &);
 
-        MovementGeneratorType GetMovementGeneratorType() { return CONFUSED_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return CONFUSED_MOTION_TYPE; }
     private:
         void _InitSpecific(T &, bool &, bool &);
         TimeTracker i_nextMoveTime;
diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h
index 47290382d..e9b6425bf 100644
--- a/src/game/FleeingMovementGenerator.h
+++ b/src/game/FleeingMovementGenerator.h
@@ -36,7 +36,7 @@ class MANGOS_DLL_SPEC FleeingMovementGenerator
         void Reset(T &);
         bool Update(T &, const uint32 &);
 
-        MovementGeneratorType GetMovementGeneratorType() { return FLEEING_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return FLEEING_MOTION_TYPE; }
 
     private:
         void _setTargetLocation(T &owner);
@@ -68,7 +68,7 @@ class MANGOS_DLL_SPEC TimedFleeingMovementGenerator
             FleeingMovementGenerator<Creature>(fright),
             i_totalFleeTime(time) {}
 
-        MovementGeneratorType GetMovementGeneratorType() { return TIMED_FLEEING_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return TIMED_FLEEING_MOTION_TYPE; }
         bool Update(Unit &, const uint32 &);
         void Finalize(Unit &);
 
diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h
index af6f68c05..d28949ae1 100644
--- a/src/game/HomeMovementGenerator.h
+++ b/src/game/HomeMovementGenerator.h
@@ -43,7 +43,7 @@ class MANGOS_DLL_SPEC HomeMovementGenerator<Creature>
         void Reset(Creature &);
         bool Update(Creature &, const uint32 &);
         void modifyTravelTime(uint32 travel_time) { i_travel_timer = travel_time; }
-        MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return HOME_MOTION_TYPE; }
 
         bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
     private:
diff --git a/src/game/IdleMovementGenerator.h b/src/game/IdleMovementGenerator.h
index 04321009a..e96bf855c 100644
--- a/src/game/IdleMovementGenerator.h
+++ b/src/game/IdleMovementGenerator.h
@@ -30,7 +30,7 @@ class MANGOS_DLL_SPEC IdleMovementGenerator : public MovementGenerator
         void Interrupt(Unit &) {}
         void Reset(Unit &);
         bool Update(Unit &, const uint32 &) { return true; }
-        MovementGeneratorType GetMovementGeneratorType() { return IDLE_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return IDLE_MOTION_TYPE; }
 };
 
 extern IdleMovementGenerator si_idleMovement;
@@ -45,7 +45,7 @@ class MANGOS_DLL_SPEC DistractMovementGenerator : public MovementGenerator
         void Interrupt(Unit& );
         void Reset(Unit& );
         bool Update(Unit& owner, const uint32& time_diff);
-        MovementGeneratorType GetMovementGeneratorType() { return DISTRACT_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return DISTRACT_MOTION_TYPE; }
 
     private:
         uint32 m_timer;
@@ -57,7 +57,7 @@ class MANGOS_DLL_SPEC AssistanceDistractMovementGenerator : public DistractMovem
         AssistanceDistractMovementGenerator(uint32 timer) :
             DistractMovementGenerator(timer) {}
 
-        MovementGeneratorType GetMovementGeneratorType() { return ASSISTANCE_DISTRACT_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return ASSISTANCE_DISTRACT_MOTION_TYPE; }
         void Finalize(Unit& unit);
 };
 
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index b3492009f..61eea2430 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -5620,7 +5620,6 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/)
             case IDLE_MOTION_TYPE:          SendSysMessage(LANG_MOVEGENS_IDLE);          break;
             case RANDOM_MOTION_TYPE:        SendSysMessage(LANG_MOVEGENS_RANDOM);        break;
             case WAYPOINT_MOTION_TYPE:      SendSysMessage(LANG_MOVEGENS_WAYPOINT);      break;
-            case ANIMAL_RANDOM_MOTION_TYPE: SendSysMessage(LANG_MOVEGENS_ANIMAL_RANDOM); break;
             case CONFUSED_MOTION_TYPE:      SendSysMessage(LANG_MOVEGENS_CONFUSED);      break;
             case CHASE_MOTION_TYPE:
             {
diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h
index efba34791..5ed08f72c 100644
--- a/src/game/MotionMaster.h
+++ b/src/game/MotionMaster.h
@@ -32,22 +32,22 @@ class Unit;
 // values 0 ... MAX_DB_MOTION_TYPE-1 used in DB
 enum MovementGeneratorType
 {
-    IDLE_MOTION_TYPE      = 0,                              // IdleMovementGenerator.h
-    RANDOM_MOTION_TYPE    = 1,                              // RandomMovementGenerator.h
-    WAYPOINT_MOTION_TYPE  = 2,                              // WaypointMovementGenerator.h
-    MAX_DB_MOTION_TYPE    = 3,                              // *** this and below motion types can't be set in DB.
-    ANIMAL_RANDOM_MOTION_TYPE = MAX_DB_MOTION_TYPE,         // Just a dummy
-    CONFUSED_MOTION_TYPE  = 4,                              // ConfusedMovementGenerator.h
-    CHASE_MOTION_TYPE     = 5,                              // TargetedMovementGenerator.h
-    HOME_MOTION_TYPE      = 6,                              // HomeMovementGenerator.h
-    FLIGHT_MOTION_TYPE    = 7,                              // WaypointMovementGenerator.h
-    POINT_MOTION_TYPE     = 8,                              // PointMovementGenerator.h
-    FLEEING_MOTION_TYPE   = 9,                              // FleeingMovementGenerator.h
-    DISTRACT_MOTION_TYPE  = 10,                             // IdleMovementGenerator.h
-    ASSISTANCE_MOTION_TYPE= 11,                             // PointMovementGenerator.h (first part of flee for assistance)
+    IDLE_MOTION_TYPE                = 0,                    // IdleMovementGenerator.h
+    RANDOM_MOTION_TYPE              = 1,                    // RandomMovementGenerator.h
+    WAYPOINT_MOTION_TYPE            = 2,                    // WaypointMovementGenerator.h
+    MAX_DB_MOTION_TYPE              = 3,                    // *** this and below motion types can't be set in DB.
+
+    CONFUSED_MOTION_TYPE            = 4,                    // ConfusedMovementGenerator.h
+    CHASE_MOTION_TYPE               = 5,                    // TargetedMovementGenerator.h
+    HOME_MOTION_TYPE                = 6,                    // HomeMovementGenerator.h
+    FLIGHT_MOTION_TYPE              = 7,                    // WaypointMovementGenerator.h
+    POINT_MOTION_TYPE               = 8,                    // PointMovementGenerator.h
+    FLEEING_MOTION_TYPE             = 9,                    // FleeingMovementGenerator.h
+    DISTRACT_MOTION_TYPE            = 10,                   // IdleMovementGenerator.h
+    ASSISTANCE_MOTION_TYPE          = 11,                   // PointMovementGenerator.h (first part of flee for assistance)
     ASSISTANCE_DISTRACT_MOTION_TYPE = 12,                   // IdleMovementGenerator.h (second part of flee for assistance)
-    TIMED_FLEEING_MOTION_TYPE = 13,                         // FleeingMovementGenerator.h (alt.second part of flee for assistance)
-    FOLLOW_MOTION_TYPE    = 14,                             // TargetedMovementGenerator.h
+    TIMED_FLEEING_MOTION_TYPE       = 13,                   // FleeingMovementGenerator.h (alt.second part of flee for assistance)
+    FOLLOW_MOTION_TYPE              = 14,                   // TargetedMovementGenerator.h
 };
 
 enum MMCleanFlag
@@ -99,12 +99,12 @@ class MANGOS_DLL_SPEC MotionMaster : private std::stack<MovementGenerator *>
         void MoveFollow(Unit* target, float dist, float angle);
         void MoveChase(Unit* target, float dist = 0.0f, float angle = 0.0f);
         void MoveConfused();
-        void MoveFleeing(Unit* enemy, uint32 time = 0);
+        void MoveFleeing(Unit* enemy, uint32 timeLimit = 0);
         void MovePoint(uint32 id, float x,float y,float z);
         void MoveSeekAssistance(float x,float y,float z);
         void MoveSeekAssistanceDistract(uint32 timer);
         void MoveTaxiFlight(uint32 path, uint32 pathnode);
-        void MoveDistract(uint32 time);
+        void MoveDistract(uint32 timeLimit);
 
         MovementGeneratorType GetCurrentMovementGeneratorType() const;
 
diff --git a/src/game/MovementGenerator.h b/src/game/MovementGenerator.h
index 014008251..9de256ff1 100644
--- a/src/game/MovementGenerator.h
+++ b/src/game/MovementGenerator.h
@@ -45,7 +45,7 @@ class MANGOS_DLL_SPEC MovementGenerator
 
         virtual bool Update(Unit &, const uint32 &time_diff) = 0;
 
-        virtual MovementGeneratorType GetMovementGeneratorType() = 0;
+        virtual MovementGeneratorType GetMovementGeneratorType() const = 0;
 
         virtual void unitSpeedChanged() { }
 
@@ -123,5 +123,6 @@ struct MovementGeneratorFactory : public SelectableMovement
 typedef FactoryHolder<MovementGenerator,MovementGeneratorType> MovementGeneratorCreator;
 typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry;
 typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository;
+
 #endif
 
diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h
index 2eacc8f0d..d109548bd 100644
--- a/src/game/PointMovementGenerator.h
+++ b/src/game/PointMovementGenerator.h
@@ -40,7 +40,7 @@ class MANGOS_DLL_SPEC PointMovementGenerator
 
         void MovementInform(T &);
 
-        MovementGeneratorType GetMovementGeneratorType() { return POINT_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return POINT_MOTION_TYPE; }
 
         bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; }
     private:
@@ -57,7 +57,7 @@ class MANGOS_DLL_SPEC AssistanceMovementGenerator
         AssistanceMovementGenerator(float _x, float _y, float _z) :
             PointMovementGenerator<Creature>(0, _x, _y, _z) {}
 
-        MovementGeneratorType GetMovementGeneratorType() { return ASSISTANCE_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return ASSISTANCE_MOTION_TYPE; }
         void Finalize(Unit &);
 };
 
diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h
index f2ebbff08..19224ed4d 100644
--- a/src/game/RandomMovementGenerator.h
+++ b/src/game/RandomMovementGenerator.h
@@ -28,7 +28,7 @@ class MANGOS_DLL_SPEC RandomMovementGenerator
 : public MovementGeneratorMedium< T, RandomMovementGenerator<T> >
 {
     public:
-        RandomMovementGenerator(const Unit &) : i_nextMoveTime(0) {}
+        explicit RandomMovementGenerator(const Unit &) : i_nextMoveTime(0) {}
 
         void _setRandomLocation(T &);
         void Initialize(T &);
@@ -40,7 +40,7 @@ class MANGOS_DLL_SPEC RandomMovementGenerator
         {
             i_destinationHolder.GetLocationNow(mapid, x,y,z);
         }
-        MovementGeneratorType GetMovementGeneratorType() { return RANDOM_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return RANDOM_MOTION_TYPE; }
 
         bool GetResetPosition(T&, float& x, float& y, float& z);
     private:
@@ -49,4 +49,5 @@ class MANGOS_DLL_SPEC RandomMovementGenerator
         DestinationHolder< Traveller<T> > i_destinationHolder;
         uint32 i_nextMove;
 };
+
 #endif
diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h
index 738d4233c..a8d446203 100644
--- a/src/game/TargetedMovementGenerator.h
+++ b/src/game/TargetedMovementGenerator.h
@@ -80,7 +80,7 @@ class MANGOS_DLL_SPEC ChaseMovementGenerator : public TargetedMovementGeneratorM
             : TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >(target, offset, angle) {}
         ~ChaseMovementGenerator() {}
 
-        MovementGeneratorType GetMovementGeneratorType() { return CHASE_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return CHASE_MOTION_TYPE; }
 
         void Initialize(T &);
         void Finalize(T &);
@@ -103,7 +103,7 @@ class MANGOS_DLL_SPEC FollowMovementGenerator : public TargetedMovementGenerator
             : TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >(target, offset, angle) {}
         ~FollowMovementGenerator() {}
 
-        MovementGeneratorType GetMovementGeneratorType() { return FOLLOW_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return FOLLOW_MOTION_TYPE; }
 
         void Initialize(T &);
         void Finalize(T &);
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
index 366c7f83a..226382790 100644
--- a/src/game/WaypointMovementGenerator.h
+++ b/src/game/WaypointMovementGenerator.h
@@ -84,7 +84,7 @@ public PathMovementBase<Creature, WaypointPath const*>
 
         void MovementInform(Creature &);
 
-        MovementGeneratorType GetMovementGeneratorType() { return WAYPOINT_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return WAYPOINT_MOTION_TYPE; }
 
         // now path movement implmementation
         void LoadPath(Creature &c);
@@ -121,7 +121,7 @@ public PathMovementBase<Player>
         void Interrupt(Player &);
         void Reset(Player &);
         bool Update(Player &, const uint32 &);
-        MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; }
+        MovementGeneratorType GetMovementGeneratorType() const { return FLIGHT_MOTION_TYPE; }
 
         void LoadPath(Player &);
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8753a8ab8..b6e1c19fe 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9541"
+ #define REVISION_NR "9542"
 #endif // __REVISION_NR_H__