diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 20:08:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 20:08:17 +0300 |
| commit | 7014a04cb0989b0e182f8a1346d33b005e200ad5 (patch) | |
| tree | 6913b1b116431beb48943fac677ea65c046ea414 /src/net | |
| parent | b796051dc7ec88e1982ffbb2e488e908d839c1ef (diff) | |
| download | plus-7014a04cb0989b0e182f8a1346d33b005e200ad5.tar.gz plus-7014a04cb0989b0e182f8a1346d33b005e200ad5.tar.bz2 plus-7014a04cb0989b0e182f8a1346d33b005e200ad5.tar.xz plus-7014a04cb0989b0e182f8a1346d33b005e200ad5.zip | |
Move attacktype into separate file.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 14 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 28 |
2 files changed, 21 insertions, 21 deletions
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); |