From 015c6e40196fc5ba8b3d6ed8151daaaad55d432e Mon Sep 17 00:00:00 2001
From: NoFantasy <nofantasy@nf.no>
Date: Tue, 12 Jan 2010 01:57:00 +0100
Subject: [PATCH] [9152] Prevent unexpected removal of move flag for following
 creatures not in combat

Signed-off-by: NoFantasy <nofantasy@nf.no>
---
 src/game/TargetedMovementGenerator.cpp | 2 +-
 src/shared/revision_nr.h               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp
index 10f259707..d14a9d1d5 100644
--- a/src/game/TargetedMovementGenerator.cpp
+++ b/src/game/TargetedMovementGenerator.cpp
@@ -93,7 +93,7 @@ void TargetedMovementGenerator<Creature>::Initialize(Creature &owner)
 {
     if (owner.HasSearchedAssistance())
         owner.AddMonsterMoveFlag(MONSTER_MOVE_WALK);
-    else
+    else if (owner.isInCombat())
         owner.RemoveMonsterMoveFlag(MONSTER_MOVE_WALK);
 
     if (((Creature*)&owner)->canFly())
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 58dd490d5..9a5c83fe6 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 "9151"
+ #define REVISION_NR "9152"
 #endif // __REVISION_NR_H__