From 41b320bbdbcdc6bc158ab9dde9741ac50f194936 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 1 Oct 2014 15:44:38 +0300
Subject: Move HIT stat from net enum into attributes.

---
 src/being/attributes.h             | 3 ++-
 src/net/ea/eaprotocol.h            | 3 +--
 src/net/ea/playerhandler.cpp       | 2 +-
 src/net/eathena/attrs.h            | 3 +--
 src/net/eathena/generalhandler.cpp | 2 +-
 src/net/eathena/playerhandler.cpp  | 2 +-
 src/net/tmwa/attrs.h               | 3 +--
 src/net/tmwa/generalhandler.cpp    | 2 +-
 src/net/tmwa/playerhandler.cpp     | 2 +-
 9 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/being/attributes.h b/src/being/attributes.h
index 4f1f6ffff..d58c2247a 100644
--- a/src/being/attributes.h
+++ b/src/being/attributes.h
@@ -49,7 +49,8 @@ namespace Attributes
         KARMA,
         MANNER,
         CRIT,
-        FLEE
+        FLEE,
+        HIT
     };
 }  // namespace Attributes
 
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index cb21ff7f1..df71a0a80 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -37,8 +37,7 @@ enum
     EA_ATK,
     EA_DEF,
     EA_MATK,
-    EA_MDEF,
-    EA_HIT
+    EA_MDEF
 };
 
 enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 54296f181..7e116e9a2 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -506,7 +506,7 @@ void PlayerHandler::setStat(const int type,
             PlayerInfo::setStatMod(EA_MDEF, base);
             break;
         case 0x0031:
-            PlayerInfo::setStatBase(EA_HIT, base);
+            PlayerInfo::setStatBase(Attributes::HIT, base);
             break;
         case 0x0032:
             PlayerInfo::setStatBase(Attributes::FLEE, base);
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index af4734f45..75f5653e3 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -39,8 +39,7 @@ namespace EAthena
         ATK,
         DEF,
         MATK,
-        MDEF,
-        HIT
+        MDEF
     };
 }  // namespace EAthena
 
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index a2e2e1be9..03c2d8864 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -358,7 +358,7 @@ void GeneralHandler::gameStarted() const
     statusWindow->addAttribute(MATK, _("M.Attack"));
     statusWindow->addAttribute(MDEF, _("M.Defense"));
     // xgettext:no-c-format
-    statusWindow->addAttribute(HIT, _("% Accuracy"));
+    statusWindow->addAttribute(Attributes::HIT, _("% Accuracy"));
     // xgettext:no-c-format
     statusWindow->addAttribute(Attributes::FLEE, _("% Evade"));
     // xgettext:no-c-format
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index e322e1374..b0e58c3ff 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -348,7 +348,7 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
     PlayerInfo::setStatBase(MDEF, msg.readInt16("left mdef"), false);
     PlayerInfo::setStatMod(MDEF, msg.readInt16("right mdef"));
 
-    PlayerInfo::setStatBase(HIT, msg.readInt16("hit"));
+    PlayerInfo::setStatBase(Attributes::HIT, msg.readInt16("hit"));
 
     PlayerInfo::setStatBase(Attributes::FLEE, msg.readInt16("flee"), false);
     PlayerInfo::setStatMod(Attributes::FLEE, msg.readInt16("flee2/10"));
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 4ee05f44e..04a49a9ca 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -39,8 +39,7 @@ namespace TmwAthena
         ATK,
         DEF,
         MATK,
-        MDEF,
-        HIT
+        MDEF
     };
 }  // namespace TmwAthena
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 24638cd39..3ec0e234d 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -327,7 +327,7 @@ void GeneralHandler::gameStarted() const
     statusWindow->addAttribute(MDEF, _("M.Defense"));
     // TRANSLATORS: player stat
     // xgettext:no-c-format
-    statusWindow->addAttribute(HIT, _("% Accuracy"));
+    statusWindow->addAttribute(Attributes::HIT, _("% Accuracy"));
     // TRANSLATORS: player stat
     // xgettext:no-c-format
     statusWindow->addAttribute(Attributes::FLEE, _("% Evade"));
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 196c3eabf..514a1d839 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -416,7 +416,7 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
     PlayerInfo::setStatBase(MDEF, msg.readInt16("mdef"), false);
     PlayerInfo::setStatMod(MDEF, msg.readInt16("mdef+"));
 
-    PlayerInfo::setStatBase(HIT, msg.readInt16("hit"));
+    PlayerInfo::setStatBase(Attributes::HIT, msg.readInt16("hit"));
 
     PlayerInfo::setStatBase(Attributes::FLEE, msg.readInt16("flee"), false);
     PlayerInfo::setStatMod(Attributes::FLEE, msg.readInt16("flee+"));
-- 
cgit v1.2.3-60-g2f50