summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-02 23:13:47 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-02 23:13:47 +0300
commit010fe80b3e44cee70422a1f19367f7630fd8a7ab (patch)
tree20ce8607e8ce929a2491b928011d1989a760fd8a /src/net
parent217859342d7ffdab90ca0f409bffb7e2511a2173 (diff)
downloadmv-010fe80b3e44cee70422a1f19367f7630fd8a7ab.tar.gz
mv-010fe80b3e44cee70422a1f19367f7630fd8a7ab.tar.bz2
mv-010fe80b3e44cee70422a1f19367f7630fd8a7ab.tar.xz
mv-010fe80b3e44cee70422a1f19367f7630fd8a7ab.zip
Fix reading attack delay.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/tmwa/beinghandler.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 7474eb66c..402a3e7eb 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -486,14 +486,14 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
if (dstBeing)
{
// Perhaps a new skill attack type should be created and used?
- if (dstSpeed)
- dstBeing->setAttackDelay(dstSpeed);
+// if (dstSpeed)
+// dstBeing->setAttackDelay(dstSpeed);
dstBeing->takeDamage(srcBeing, param1, Being::HIT);
}
if (srcBeing)
{
- if (srcSpeed)
- srcBeing->setAttackDelay(srcSpeed);
+// if (srcSpeed)
+// srcBeing->setAttackDelay(srcSpeed);
srcBeing->handleAttack(dstBeing, param1, Being::HIT);
}
break;
@@ -520,14 +520,14 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
case Being::FLEE: // Lucky Dodge
if (dstBeing)
{
- if (dstSpeed)
- dstBeing->setAttackDelay(dstSpeed);
+// if (dstSpeed)
+// dstBeing->setAttackDelay(dstSpeed);
dstBeing->takeDamage(srcBeing, param1,
static_cast<Being::AttackType>(type));
}
if (srcBeing)
{
- if (srcSpeed)
+ if (srcSpeed && srcBeing->getType() == Being::PLAYER)
srcBeing->setAttackDelay(srcSpeed);
srcBeing->handleAttack(dstBeing, param1,
static_cast<Being::AttackType>(type));