mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 07:37:01 +00:00
Merge commit 'origin/master' into 310
Conflicts: src/game/TargetedMovementGenerator.cpp win/VC71/shared.vcproj
This commit is contained in:
commit
52effd119c
39 changed files with 523 additions and 7161 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue