Merge commit 'origin/master' into 310

Conflicts:
	src/game/TargetedMovementGenerator.cpp
	win/VC71/shared.vcproj
This commit is contained in:
tomrus88 2009-05-21 20:17:19 +04:00
commit 52effd119c
39 changed files with 523 additions and 7161 deletions

View file

@ -92,7 +92,10 @@ template<class T>
void
TargetedMovementGenerator<T>::Initialize(T &owner)
{
owner.RemoveUnitMovementFlag(MONSTER_MOVE_WALK);
if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->HasSearchedAssistance())
owner.AddUnitMovementFlag(MONSTER_MOVE_WALK);
else
owner.RemoveUnitMovementFlag(MONSTER_MOVE_WALK);
if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly())
owner.AddUnitMovementFlag(MONSTER_MOVE_FLY);