From 390e5da0f9ecc4407aa7d4bcba1af5730db56271 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 29 May 2015 20:59:14 +0300
Subject: Convert AttackType enum into strong typed enum.

---
 src/net/ea/beinghandler.cpp      | 11 ++++++-----
 src/net/eathena/beinghandler.cpp |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ba1d21fbd..a80a9d4f6 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -178,7 +178,8 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg)
     msg.readInt32("dst speed");
     const int param1 = msg.readInt16("param1");
     msg.readInt16("param 2");
-    const uint8_t type = msg.readUInt8("type");
+    const AttackTypeT type = static_cast<AttackTypeT>(
+        msg.readUInt8("type"));
     msg.readInt16("param 3");
 
     switch (type)
@@ -201,17 +202,17 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg)
             {
                 // level not present, using 1
                 dstBeing->takeDamage(srcBeing, param1,
-                    static_cast<AttackType::Type>(type), 1);
+                    static_cast<AttackTypeT>(type), 1);
             }
             break;
 
-        case 0x01:  // dead or pickup?
+        case AttackType::PICKUP:
             break;
             // tmw server can send here garbage?
 //            if (srcBeing)
 //                srcBeing->setAction(BeingAction::DEAD, 0);
 
-        case 0x02:  // Sit
+        case AttackType::SIT:
             if (srcBeing)
             {
                 srcBeing->setAction(BeingAction::SIT, 0);
@@ -224,7 +225,7 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg)
             }
             break;
 
-        case 0x03:  // Stand up
+        case AttackType::STAND:
             if (srcBeing)
             {
                 srcBeing->setAction(BeingAction::STAND, 0);
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 99866bfbf..79354e34c 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1280,7 +1280,8 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
     msg.readInt32("dst speed");
     const int param1 = msg.readInt32("damage");
     msg.readInt16("count");
-    const uint8_t type = msg.readUInt8("action");
+    const AttackTypeT type = static_cast<AttackTypeT>(
+        msg.readUInt8("action"));
     msg.readInt32("left damage");
 
     switch (type)
@@ -1307,7 +1308,7 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
             {
                 // level not present, using 1
                 dstBeing->takeDamage(srcBeing, param1,
-                    static_cast<AttackType::Type>(type), 1);
+                    static_cast<AttackTypeT>(type), 1);
             }
             break;
 
-- 
cgit v1.2.3-70-g09d2