aboutsummaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-23 21:44:48 -0500
committermegamage <none@none>2009-04-23 21:44:48 -0500
commitbd56af12949ac649fea185e3481d7ca05bb25660 (patch)
treed326fabeba071c989d946c70c9842f596cb5141c /src/game
parent84e9ffb48798f622872a0a5f1e33cd24021b51e0 (diff)
parente97ddc5872174467965d81d767b4c54e6a96cd4a (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game')
-rw-r--r--src/game/Creature.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 9c27996931d..5b3f45b66dd 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1573,7 +1573,8 @@ bool Creature::IsWithinSightDist(Unit const* u) const
bool Creature::canStartAttack(Unit const* who) const
{
- if(!who->isInAccessiblePlaceFor(this)
+ if(isCivilian()
+ || !who->isInAccessiblePlaceFor(this)
|| !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE
|| !IsWithinDistInMap(who, GetAttackDistance(who)))
return false;