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

---
 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  | 4 ++--
 src/net/tmwa/attrs.h               | 3 +--
 src/net/tmwa/generalhandler.cpp    | 2 +-
 src/net/tmwa/playerhandler.cpp     | 4 ++--
 8 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'src/net')

diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index f355b16a9..b1df70a20 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -34,8 +34,7 @@ enum
     EA_DEX,
     EA_LUK,
 
-    EA_ATK,
-    EA_DEF
+    EA_ATK
 };
 
 enum
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 4c9f5be61..c12da7bfc 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -494,10 +494,10 @@ void PlayerHandler::setStat(const int type,
             PlayerInfo::setStatMod(Attributes::MATK, base);
             break;
         case 0x002d:
-            PlayerInfo::setStatBase(EA_DEF, base);
+            PlayerInfo::setStatBase(Attributes::DEF, base);
             break;
         case 0x002e:
-            PlayerInfo::setStatMod(EA_DEF, base);
+            PlayerInfo::setStatMod(Attributes::DEF, base);
             break;
         case 0x002f:
             PlayerInfo::setStatBase(Attributes::MDEF, base);
diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h
index c40b48092..db866c0bc 100644
--- a/src/net/eathena/attrs.h
+++ b/src/net/eathena/attrs.h
@@ -36,8 +36,7 @@ namespace EAthena
         DEX,
         LUK,
 
-        ATK,
-        DEF
+        ATK
     };
 }  // namespace EAthena
 
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index a07040f18..83b55e3bd 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -354,7 +354,7 @@ void GeneralHandler::gameStarted() const
     statusWindow->addAttribute(LUK, _("Luck"), "luk", true);
 
     statusWindow->addAttribute(ATK, _("Attack"));
-    statusWindow->addAttribute(DEF, _("Defense"));
+    statusWindow->addAttribute(Attributes::DEF, _("Defense"));
     statusWindow->addAttribute(Attributes::MATK, _("M.Attack"));
     statusWindow->addAttribute(Attributes::MDEF, _("M.Defense"));
     // xgettext:no-c-format
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index b3b7df25b..c1412819b 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -342,8 +342,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
     val = msg.readInt16("left matk");
     PlayerInfo::setStatMod(Attributes::MATK, val);
 
-    PlayerInfo::setStatBase(DEF, msg.readInt16("left def"), false);
-    PlayerInfo::setStatMod(DEF, msg.readInt16("right def"));
+    PlayerInfo::setStatBase(Attributes::DEF, msg.readInt16("left def"), false);
+    PlayerInfo::setStatMod(Attributes::DEF, msg.readInt16("right def"));
 
     PlayerInfo::setStatBase(Attributes::MDEF,
         msg.readInt16("left mdef"), false);
diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 03c38d804..bd5a0cae4 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -36,8 +36,7 @@ namespace TmwAthena
         DEX,
         LUK,
 
-        ATK,
-        DEF
+        ATK
     };
 }  // namespace TmwAthena
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 0fdb7017c..ecc320219 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -320,7 +320,7 @@ void GeneralHandler::gameStarted() const
     // TRANSLATORS: player stat
     statusWindow->addAttribute(ATK, _("Attack"));
     // TRANSLATORS: player stat
-    statusWindow->addAttribute(DEF, _("Defense"));
+    statusWindow->addAttribute(Attributes::DEF, _("Defense"));
     // TRANSLATORS: player stat
     statusWindow->addAttribute(Attributes::MATK, _("M.Attack"));
     // TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 247a0f6d9..504484217 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -410,8 +410,8 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
     val = msg.readInt16("matk+");
     PlayerInfo::setStatMod(Attributes::MATK, val);
 
-    PlayerInfo::setStatBase(DEF, msg.readInt16("def"), false);
-    PlayerInfo::setStatMod(DEF, msg.readInt16("def+"));
+    PlayerInfo::setStatBase(Attributes::DEF, msg.readInt16("def"), false);
+    PlayerInfo::setStatMod(Attributes::DEF, msg.readInt16("def+"));
 
     PlayerInfo::setStatBase(Attributes::MDEF, msg.readInt16("mdef"), false);
     PlayerInfo::setStatMod(Attributes::MDEF, msg.readInt16("mdef+"));
-- 
cgit v1.2.3-60-g2f50