Move player attributes into separate file.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index f24c984ed..fdcf2ed22 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -25,6 +25,8 @@
 #include "client.h"
 #include "configuration.h"
 
+#include "being/attributes.h"
+
 #include "net/logindata.h"
 #include "net/net.h"
 
@@ -129,8 +131,8 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     tempPlayer->setGender(token.sex);
 
     PlayerInfoBackend &data = character->data;
-    data.mAttributes[PlayerInfo::EXP] = msg.readInt32();
-    data.mAttributes[PlayerInfo::MONEY] = msg.readInt32();
+    data.mAttributes[Attributes::EXP] = msg.readInt32();
+    data.mAttributes[Attributes::MONEY] = msg.readInt32();
     Stat &jobStat = data.mStats[JOB];
     jobStat.exp = msg.readInt32();
 
@@ -148,10 +150,10 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     msg.readInt32();                       // manner
     msg.readInt16();                       // character points left
 
-    data.mAttributes[PlayerInfo::HP] = msg.readInt16();
-    data.mAttributes[PlayerInfo::MAX_HP] = msg.readInt16();
-    data.mAttributes[PlayerInfo::MP] = msg.readInt16();
-    data.mAttributes[PlayerInfo::MAX_MP] = msg.readInt16();
+    data.mAttributes[Attributes::HP] = msg.readInt16();
+    data.mAttributes[Attributes::MAX_HP] = msg.readInt16();
+    data.mAttributes[Attributes::MP] = msg.readInt16();
+    data.mAttributes[Attributes::MAX_MP] = msg.readInt16();
 
     msg.readInt16();                             // speed
     tempPlayer->setSubtype(msg.readInt16(), 0);  // class (used for race)
@@ -160,7 +162,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
 
     tempPlayer->setSprite(SPRITE_WEAPON, weapon, "", 1, true);
 
-    data.mAttributes[PlayerInfo::LEVEL] = msg.readInt16();
+    data.mAttributes[Attributes::LEVEL] = msg.readInt16();
 
     msg.readInt16();  // skill point
     const int bottomClothes = msg.readInt16();