Convert Attributes enum into strong typed enum.

3 files changed, 9 insertions, 8 deletions

diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 0ae7bfc4f..6662009b3 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -147,7 +147,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     PlayerInfoBackend &data = character->data;
     data.mAttributes[Attributes::EXP] = msg.readInt32("exp");
     data.mAttributes[Attributes::MONEY] = msg.readInt32("money");
-    Stat &jobStat = data.mStats[static_cast<size_t>(Attributes::JOB)];
+    Stat &jobStat = data.mStats[Attributes::JOB];
     jobStat.exp = msg.readInt32("job");
 
     const int temp = msg.readInt32("job level");
@@ -197,11 +197,12 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
 
     character->dummy = tempPlayer;
 
-    for (int i = 0; i < 6; i++)
-    {
-        character->data.mStats[i + Attributes::STR].base
-            = msg.readUInt8("stat");
-    }
+    character->data.mStats[Attributes::STR].base = msg.readUInt8("str");
+    character->data.mStats[Attributes::AGI].base = msg.readUInt8("agi");
+    character->data.mStats[Attributes::VIT].base = msg.readUInt8("vit");
+    character->data.mStats[Attributes::INT].base = msg.readUInt8("int");
+    character->data.mStats[Attributes::DEX].base = msg.readUInt8("dex");
+    character->data.mStats[Attributes::LUK].base = msg.readUInt8("luk");
 
     if (withColors)
     {
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 95b157c00..d2871a456 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -146,7 +146,7 @@ void PlayerHandler::emote(const uint8_t emoteId) const
     outMsg.writeInt8(emoteId, "emote id");
 }
 
-void PlayerHandler::increaseAttribute(const int attr) const
+void PlayerHandler::increaseAttribute(const AttributesT attr) const
 {
     if (attr >= Attributes::STR && attr <= Attributes::LUK)
     {
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index d8f159e8b..d831d7ab3 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -44,7 +44,7 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
         void stopAttack() const override final;
         void emote(const uint8_t emoteId) const override final;
 
-        void increaseAttribute(const int attr) const override final;
+        void increaseAttribute(const AttributesT attr) const override final;
         void increaseSkill(const uint16_t skillId) const override final;
 
         void pickUp(const FloorItem *const floorItem) const override final;