summaryrefslogtreecommitdiff
path: root/src/game-server/being.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:09:23 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-08-26 22:56:46 +0200
commitf31277b327df701361391b1d4b8bd6f89f4e3109 (patch)
tree0fd2b85c13cb11654ff6cd027e0be7ff6b61c2d6 /src/game-server/being.cpp
parent960d40d819afb65387469591bdb02e6819d72294 (diff)
downloadmanaserv-f31277b327df701361391b1d4b8bd6f89f4e3109.tar.gz
manaserv-f31277b327df701361391b1d4b8bd6f89f4e3109.tar.bz2
manaserv-f31277b327df701361391b1d4b8bd6f89f4e3109.tar.xz
manaserv-f31277b327df701361391b1d4b8bd6f89f4e3109.zip
[Abilities] Removed the old autoattack system
As a side effect i had to remove the monster attack AI for now. I will readd this as next thing.
Diffstat (limited to 'src/game-server/being.cpp')
-rw-r--r--src/game-server/being.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index f3d45305..22ce30d4 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -27,7 +27,6 @@
#include "game-server/attributemanager.h"
#include "game-server/character.h"
#include "game-server/collisiondetection.h"
-#include "game-server/combatcomponent.h"
#include "game-server/mapcomposite.h"
#include "game-server/effect.h"
#include "game-server/skillmanager.h"
@@ -310,8 +309,8 @@ int BeingComponent::directionToAngle(int direction)
void BeingComponent::setAction(Entity &entity, BeingAction action)
{
mAction = action;
- if (action != ATTACK && // The players are informed about these actions
- action != WALK) // by other messages
+ // The players are informed about these actions by other messages
+ if (action != WALK)
{
entity.getComponent<ActorComponent>()->raiseUpdateFlags(
UPDATEFLAG_ACTIONCHANGE);