From 97ceb0fc66be86d09b2bc42b7580d3976cbddd80 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 1 Oct 2014 17:16:05 +0300
Subject: Move DEX stat from net enum into attributes.

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

diff --git a/src/being/attributes.h b/src/being/attributes.h
index bb8df97a4..43f3af382 100644
--- a/src/being/attributes.h
+++ b/src/being/attributes.h
@@ -42,6 +42,7 @@ namespace Attributes
         SKILL_POINTS,
         CHAR_POINTS,
         CORR_POINTS,
+        DEX = 17,
         LUK = 18,
         ATTACK_DELAY = 100,
         ATTACK_RANGE = 101,
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 0ab833e5c..fcd9cd3cf 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -30,8 +30,7 @@ enum
     EA_STR = 0xd,
     EA_AGI,
     EA_VIT,
-    EA_INT,
-    EA_DEX
+    EA_INT
 };
 
 enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index f16f6103f..5c631338c 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -379,7 +379,7 @@ void PlayerHandler::setStat(const int type,
             setStatComplex(EA_INT);
             break;
         case 0x0011:
-            setStatComplex(EA_DEX);
+            setStatComplex(Attributes::DEX);
             break;
         case 0x0012:
             setStatComplex(Attributes::LUK);
@@ -467,7 +467,7 @@ void PlayerHandler::setStat(const int type,
             statusWindow->setPointsNeeded(EA_INT, base);
             break;
         case 0x0024:
-            statusWindow->setPointsNeeded(EA_DEX, base);
+            statusWindow->setPointsNeeded(Attributes::DEX, base);
             break;
         case 0x0025:
             statusWindow->setPointsNeeded(Attributes::LUK, base);
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index df9e0347d..e536a1818 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -32,8 +32,7 @@ namespace EAthena
         STR = 0xd,
         AGI,
         VIT,
-        INT,
-        DEX
+        INT
     };
 }  // namespace EAthena
 
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index b8c8f2322..53e0636d8 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -350,7 +350,7 @@ void GeneralHandler::gameStarted() const
     statusWindow->addAttribute(AGI, _("Agility"), "agi", true);
     statusWindow->addAttribute(VIT, _("Vitality"), "vit", true);
     statusWindow->addAttribute(INT, _("Intelligence"), "int", true);
-    statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true);
+    statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true);
     statusWindow->addAttribute(Attributes::LUK, _("Luck"), "luk", true);
 
     statusWindow->addAttribute(Attributes::ATK, _("Attack"));
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 54876f14b..1bdf1a39e 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -319,11 +319,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
         msg.readUInt8("int cost");
 
     val = msg.readUInt8("dex");
-    PlayerInfo::setStatBase(DEX, val);
+    PlayerInfo::setStatBase(Attributes::DEX, val);
     if (statusWindow)
-        statusWindow->setPointsNeeded(DEX, msg.readUInt8("dex cost"));
+    {
+        statusWindow->setPointsNeeded(Attributes::DEX,
+            msg.readUInt8("dex cost"));
+    }
     else
+    {
         msg.readUInt8("dex cost");
+    }
 
     val = msg.readUInt8("luk");
     PlayerInfo::setStatBase(Attributes::LUK, val);
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 0377d10cd..fe2068965 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -32,8 +32,7 @@ namespace TmwAthena
         STR = 0xd,
         AGI,
         VIT,
-        INT,
-        DEX
+        INT
     };
 }  // namespace TmwAthena
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index d246d1980..c0e341b00 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -313,7 +313,7 @@ void GeneralHandler::gameStarted() const
     // TRANSLATORS: player stat
     statusWindow->addAttribute(INT, _("Intelligence"), "int", true);
     // TRANSLATORS: player stat
-    statusWindow->addAttribute(DEX, _("Dexterity"), "dex", true);
+    statusWindow->addAttribute(Attributes::DEX, _("Dexterity"), "dex", true);
     // TRANSLATORS: player stat
     statusWindow->addAttribute(Attributes::LUK, _("Luck"), "luk", true);
     // TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 217d7aff8..5ef1439fe 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -387,11 +387,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
         msg.readUInt8("int cost");
 
     val = msg.readUInt8("dex");
-    PlayerInfo::setStatBase(DEX, val);
+    PlayerInfo::setStatBase(Attributes::DEX, val);
     if (statusWindow)
-        statusWindow->setPointsNeeded(DEX, msg.readUInt8("dex cost"));
+    {
+        statusWindow->setPointsNeeded(Attributes::DEX,
+            msg.readUInt8("dex cost"));
+    }
     else
+    {
         msg.readUInt8("dex cost");
+    }
 
     val = msg.readUInt8("luk");
     PlayerInfo::setStatBase(Attributes::LUK, val);
-- 
cgit v1.2.3-70-g09d2