From 7014a04cb0989b0e182f8a1346d33b005e200ad5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 6 Jan 2015 20:08:17 +0300 Subject: Move attacktype into separate file. --- src/net/ea/beinghandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/net/ea/beinghandler.cpp') diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 3c22ac62d..54f13472e 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, Being::SKILL, id); + dstBeing->takeDamage(srcBeing, param1, AttackType::SKILL, id); BLOCK_END("BeingHandler::processSkillDamage") } @@ -190,11 +190,11 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) switch (type) { - case Being::HIT: // Damage - case Being::CRITICAL: // Critical Damage - case Being::MULTI: // Critical Damage - case Being::REFLECT: // Reflected Damage - case Being::FLEE: // Lucky Dodge + case AttackType::HIT: // Damage + case AttackType::CRITICAL: // Critical Damage + case AttackType::MULTI: // Critical Damage + case AttackType::REFLECT: // Reflected Damage + case AttackType::FLEE: // Lucky Dodge if (srcBeing) { if (srcSpeed && srcBeing->getType() == ActorType::Player) @@ -207,7 +207,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) if (dstBeing) { dstBeing->takeDamage(srcBeing, param1, - static_cast(type)); + static_cast(type)); } break; -- cgit v1.2.3-60-g2f50