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

---
 src/net/tmwa/attrs.h               |  4 +---
 src/net/tmwa/charserverhandler.cpp |  5 ++++-
 src/net/tmwa/generalhandler.cpp    |  2 +-
 src/net/tmwa/playerhandler.cpp     | 11 ++++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/net/tmwa')

diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 6ab80ec16..060e44c71 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -27,9 +27,7 @@ namespace TmwAthena
 {
     enum
     {
-        JOB = 0xa,
-
-        STR = 0xd
+        JOB = 0xa
     };
 }  // namespace TmwAthena
 
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index adf82cf34..b1d1fa055 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -197,7 +197,10 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     character->dummy = tempPlayer;
 
     for (int i = 0; i < 6; i++)
-        character->data.mStats[i + STR].base = msg.readUInt8("stat");
+    {
+        character->data.mStats[i + Attributes::STR].base
+            = msg.readUInt8("stat");
+    }
 
     if (withColors)
     {
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 04536cd94..a888cb106 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -305,7 +305,7 @@ void GeneralHandler::gameStarted() const
     statusWindow->clearAttributes();
 
     // TRANSLATORS: player stat
-    statusWindow->addAttribute(STR, _("Strength"), "str", true);
+    statusWindow->addAttribute(Attributes::STR, _("Strength"), "str", true);
     // TRANSLATORS: player stat
     statusWindow->addAttribute(Attributes::AGI, _("Agility"), "agi", true);
     // TRANSLATORS: player stat
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 0899e9508..89ba976a9 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -161,7 +161,7 @@ void PlayerHandler::emote(const uint8_t emoteId) const
 
 void PlayerHandler::increaseAttribute(const int attr) const
 {
-    if (attr >= STR && attr <= Attributes::LUK)
+    if (attr >= Attributes::STR && attr <= Attributes::LUK)
     {
         createOutPacket(CMSG_STAT_UPDATE_REQUEST);
         outMsg.writeInt16(static_cast<int16_t>(attr));
@@ -359,11 +359,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
         msg.readInt16("char points"));
 
     unsigned int val = msg.readUInt8("str");
-    PlayerInfo::setStatBase(STR, val);
+    PlayerInfo::setStatBase(Attributes::STR, val);
     if (statusWindow)
-        statusWindow->setPointsNeeded(STR, msg.readUInt8("str cost"));
+    {
+        statusWindow->setPointsNeeded(Attributes::STR,
+            msg.readUInt8("str cost"));
+    }
     else
+    {
         msg.readUInt8("str cost");
+    }
 
     val = msg.readUInt8("agi");
     PlayerInfo::setStatBase(Attributes::AGI, val);
-- 
cgit v1.2.3-70-g09d2