From 7014a04cb0989b0e182f8a1346d33b005e200ad5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 6 Jan 2015 20:08:17 +0300
Subject: Move attacktype into separate file.
---
src/net/ea/beinghandler.cpp | 14 +++++++-------
src/net/eathena/beinghandler.cpp | 28 ++++++++++++++--------------
2 files changed, 21 insertions(+), 21 deletions(-)
(limited to 'src/net')
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<Being::AttackType>(type));
+ static_cast<AttackType::Type>(type));
}
break;
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index f8d0c8954..ab8700227 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1111,15 +1111,15 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
switch (type)
{
- case Being::HIT: // Damage
- case Being::CRITICAL: // Critical Damage
- case Being::MULTI: // Critical Damage
- case Being::MULTI_REFLECT:
- case Being::REFLECT: // Reflected Damage
- case Being::FLEE: // Lucky Dodge
- case Being::SPLASH:
- case Being::SKILL:
- case Being::REPEATE:
+ case AttackType::HIT: // Damage
+ case AttackType::CRITICAL: // Critical Damage
+ case AttackType::MULTI: // Critical Damage
+ case AttackType::MULTI_REFLECT:
+ case AttackType::REFLECT: // Reflected Damage
+ case AttackType::FLEE: // Lucky Dodge
+ case AttackType::SPLASH:
+ case AttackType::SKILL:
+ case AttackType::REPEATE:
if (srcBeing)
{
if (srcSpeed && srcBeing->getType() == ActorType::Player)
@@ -1132,17 +1132,17 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
if (dstBeing)
{
dstBeing->takeDamage(srcBeing, param1,
- static_cast<Being::AttackType>(type));
+ static_cast<AttackType::Type>(type));
}
break;
- case Being::PICKUP:
+ case AttackType::PICKUP:
break;
- case Being::TOUCH_SKILL:
+ case AttackType::TOUCH_SKILL:
break;
- case Being::SIT:
+ case AttackType::SIT:
if (srcBeing)
{
srcBeing->setAction(BeingAction::SIT, 0);
@@ -1155,7 +1155,7 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
}
break;
- case Being::STAND:
+ case AttackType::STAND:
if (srcBeing)
{
srcBeing->setAction(BeingAction::STAND, 0);
--
cgit v1.2.3-70-g09d2