summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-03-05 22:33:09 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-03-05 22:33:09 +0000
commit5f9bbd205fec7d66643861a5204c6cc7dec639ba (patch)
treead21b3432c3cafb10a9e4a7d32b600cebe74d92c /src/net
parenta74208583e806fcfdc485428fb4f9e694e962455 (diff)
downloadmana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.tar.gz
mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.tar.bz2
mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.tar.xz
mana-5f9bbd205fec7d66643861a5204c6cc7dec639ba.zip
Merged new_playerset branch into trunk.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/beinghandler.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 9578f5c1..a01122d1 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -203,7 +203,14 @@ void BeingHandler::handleMessage(MessageIn *msg)
srcBeing != player_node)
{
// buggy
- srcBeing->action = Being::ATTACK;
+ if (srcBeing->getType() == Being::MONSTER)
+ {
+ srcBeing->action = Being::MONSTER_ATTACK;
+ }
+ else
+ {
+ srcBeing->action = Being::ATTACK;
+ }
srcBeing->mFrame = 0;
srcBeing->walk_time = tick_time;
}