From c9795055ee1b6079ef9b0c0e3faf4bb79704bd98 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 Jul 2016 02:30:47 +0300 Subject: Add into player attributes prefix PLAYER_. --- src/net/tmwa/charserverrecv.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/net/tmwa/charserverrecv.cpp') diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 9728303ff..31a5afe64 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -74,9 +74,9 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, msg.readBeingId("account id"), BeingTypeId_zero); PlayerInfoBackend &data = character->data; - data.mAttributes[Attributes::EXP] = msg.readInt32("exp"); + data.mAttributes[Attributes::PLAYER_EXP] = msg.readInt32("exp"); data.mAttributes[Attributes::MONEY] = msg.readInt32("money"); - Stat &jobStat = data.mStats[Attributes::JOB]; + Stat &jobStat = data.mStats[Attributes::PLAYER_JOB]; jobStat.exp = msg.readInt32("job"); const int temp = msg.readInt32("job level"); @@ -93,10 +93,10 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, tempPlayer->setManner(msg.readInt32("manner")); msg.readInt16("character points left"); - data.mAttributes[Attributes::HP] = msg.readInt16("hp"); - data.mAttributes[Attributes::MAX_HP] = msg.readInt16("max hp"); - data.mAttributes[Attributes::MP] = msg.readInt16("mp"); - data.mAttributes[Attributes::MAX_MP] = msg.readInt16("max mp"); + data.mAttributes[Attributes::PLAYER_HP] = msg.readInt16("hp"); + data.mAttributes[Attributes::PLAYER_MAX_HP] = msg.readInt16("max hp"); + data.mAttributes[Attributes::PLAYER_MP] = msg.readInt16("mp"); + data.mAttributes[Attributes::PLAYER_MAX_MP] = msg.readInt16("max mp"); msg.readInt16("speed"); const uint16_t race = msg.readInt16("class"); @@ -108,7 +108,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, weapon); tempPlayer->setWeaponId(weapon); - data.mAttributes[Attributes::LEVEL] = msg.readInt16("level"); + data.mAttributes[Attributes::PLAYER_LEVEL] = msg.readInt16("level"); msg.readInt16("skill point"); const int bottomClothes = msg.readInt16("bottom clothes"); @@ -137,12 +137,12 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, character->dummy = tempPlayer; - 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"); + character->data.mStats[Attributes::PLAYER_STR].base = msg.readUInt8("str"); + character->data.mStats[Attributes::PLAYER_AGI].base = msg.readUInt8("agi"); + character->data.mStats[Attributes::PLAYER_VIT].base = msg.readUInt8("vit"); + character->data.mStats[Attributes::PLAYER_INT].base = msg.readUInt8("int"); + character->data.mStats[Attributes::PLAYER_DEX].base = msg.readUInt8("dex"); + character->data.mStats[Attributes::PLAYER_LUK].base = msg.readUInt8("luk"); tempPlayer->setSpriteId(SPRITE_HAIR, shoes); -- cgit v1.2.3-60-g2f50