diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-29 19:53:06 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-29 19:53:06 +0100 |
| commit | 8733cdf3ab6969613301138b05070a441a657b76 (patch) | |
| tree | a8d64e2f7d03f32404841e843efda975b99997c1 /src/game-server/being.cpp | |
| parent | 5f03e73484a50c9689956b32ef97630b56d2a00d (diff) | |
| download | manaserv-8733cdf3ab6969613301138b05070a441a657b76.tar.gz manaserv-8733cdf3ab6969613301138b05070a441a657b76.tar.bz2 manaserv-8733cdf3ab6969613301138b05070a441a657b76.tar.xz manaserv-8733cdf3ab6969613301138b05070a441a657b76.zip | |
Moved parts needing to be in sync with the client in protocol.h.
Trivial fix.
Diffstat (limited to 'src/game-server/being.cpp')
| -rw-r--r-- | src/game-server/being.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp index 895afde4..9400f5df 100644 --- a/src/game-server/being.cpp +++ b/src/game-server/being.cpp @@ -316,7 +316,7 @@ int Being::performAttack(Being *target, const Damage &damage) { int Being::performAttack(Being *target, unsigned range, const Damage &damage) { // check target legality - if (!target || target == this || target->getAction() == Being::DEAD + if (!target || target == this || target->getAction() == DEAD || !target->canFight()) return -1; if (getMap()->getPvP() == PVP_NONE && target->getType() == OBJECT_CHARACTER @@ -336,11 +336,11 @@ int Being::performAttack(Being *target, unsigned range, const Damage &damage) return (mTarget->damage(this, damage)); } -void Being::setAction(Action action) +void Being::setAction(BeingAction action) { mAction = action; - if (action != Being::ATTACK && // The players are informed about these actions - action != Being::WALK) // by other messages + if (action != ATTACK && // The players are informed about these actions + action != WALK) // by other messages { raiseUpdateFlags(UPDATEFLAG_ACTIONCHANGE); } |