From 43713ab4bb834e898c0d2c3289555d22fe08132e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 1 Oct 2014 17:26:27 +0300
Subject: Move VIT stat from net enum into attributes.

---
 src/net/tmwa/attrs.h            | 3 +--
 src/net/tmwa/generalhandler.cpp | 2 +-
 src/net/tmwa/playerhandler.cpp  | 9 +++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/net/tmwa')

diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h
index 746b05607..75bf75e1b 100644
--- a/src/net/tmwa/attrs.h
+++ b/src/net/tmwa/attrs.h
@@ -30,8 +30,7 @@ namespace TmwAthena
         JOB = 0xa,
 
         STR = 0xd,
-        AGI,
-        VIT
+        AGI
     };
 }  // namespace TmwAthena
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index f2ed990fe..a41d900c4 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -309,7 +309,7 @@ void GeneralHandler::gameStarted() const
     // TRANSLATORS: player stat
     statusWindow->addAttribute(AGI, _("Agility"), "agi", true);
     // TRANSLATORS: player stat
-    statusWindow->addAttribute(VIT, _("Vitality"), "vit", true);
+    statusWindow->addAttribute(Attributes::VIT, _("Vitality"), "vit", true);
     // TRANSLATORS: player stat
     statusWindow->addAttribute(Attributes::INT,
         _("Intelligence"), "int", true);
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 78d4876f2..6e7d4f9a6 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -373,11 +373,16 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
         msg.readUInt8("agi cost");
 
     val = msg.readUInt8("vit");
-    PlayerInfo::setStatBase(VIT, val);
+    PlayerInfo::setStatBase(Attributes::VIT, val);
     if (statusWindow)
-        statusWindow->setPointsNeeded(VIT, msg.readUInt8("vit cost"));
+    {
+        statusWindow->setPointsNeeded(Attributes::VIT,
+            msg.readUInt8("vit cost"));
+    }
     else
+    {
         msg.readUInt8("vit cost");
+    }
 
     val = msg.readUInt8("int");
     PlayerInfo::setStatBase(Attributes::INT, val);
-- 
cgit v1.2.3-70-g09d2