diff options
| author | megamage <none@none> | 2008-12-07 09:21:12 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2008-12-07 09:21:12 -0600 |
| commit | 087f735251a248217627a362f122b671a618729c (patch) | |
| tree | ed536d747a0d3df828d748af3bdeb231a2fc5d16 /src/game/Unit.cpp | |
| parent | f593c806cb3b20881c5769cc7bcee747384b7c64 (diff) | |
*Use react state instead of isaggressive. Allow civilian to fight back.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e397b767adf..c6a1f17df35 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9592,7 +9592,7 @@ void Unit::CombatStart(Unit* target) target->SetStandState(PLAYER_STATE_NONE); if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER - && ((Creature*)target)->isAggressive() && ((Creature*)target)->AI()) + && !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->AI()) { SetInCombatWith(target); target->SetInCombatWith(this); |