summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-09 17:53:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-09 17:53:52 +0300
commit4fe5fd9a471760c8ce54c71c8cdf3f27c8fb27ae (patch)
tree4efae7d8e5ef3f60b5b8dd9231fa2770492908a0 /src/net
parent0de391b6566f347d546be4dc56999b3c502fa46b (diff)
downloadplus-4fe5fd9a471760c8ce54c71c8cdf3f27c8fb27ae.tar.gz
plus-4fe5fd9a471760c8ce54c71c8cdf3f27c8fb27ae.tar.bz2
plus-4fe5fd9a471760c8ce54c71c8cdf3f27c8fb27ae.tar.xz
plus-4fe5fd9a471760c8ce54c71c8cdf3f27c8fb27ae.zip
On skill attacks on target for show effect use skill attribute skillHitEffectId.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/beinghandler.cpp5
-rw-r--r--src/net/eathena/beinghandler.cpp3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index eeffe62f5..40ee477a0 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -162,7 +162,7 @@ void BeingHandler::processSkillDamage(Net::MessageIn &msg)
if (srcBeing)
srcBeing->handleSkill(dstBeing, param1, id, level);
if (dstBeing)
- dstBeing->takeDamage(srcBeing, param1, AttackType::SKILL, id);
+ dstBeing->takeDamage(srcBeing, param1, AttackType::SKILL, id, level);
BLOCK_END("BeingHandler::processSkillDamage")
}
@@ -206,8 +206,9 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg)
}
if (dstBeing)
{
+ // level not present, using 1
dstBeing->takeDamage(srcBeing, param1,
- static_cast<AttackType::Type>(type));
+ static_cast<AttackType::Type>(type), 1);
}
break;
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 3f0ecf4ac..b0620b1f2 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1306,8 +1306,9 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
}
if (dstBeing)
{
+ // level not present, using 1
dstBeing->takeDamage(srcBeing, param1,
- static_cast<AttackType::Type>(type));
+ static_cast<AttackType::Type>(type), 1);
}
break;