From f70dcfe0a82db3aee879953f117d12aecc4fce85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Sep 2017 23:13:28 +0300 Subject: Rename Attributes::PLAYER_JOB to Attributes::PLAYER_JOB_LEVEL. --- src/net/eathena/charserverrecv.cpp | 2 +- src/net/eathena/playerhandler.cpp | 2 +- src/net/tmwa/charserverrecv.cpp | 3 ++- src/net/tmwa/playerhandler.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/net') diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index f60fb1ff0..8e64385ef 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -101,7 +101,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, data.mAttributes[Attributes::PLAYER_JOB_EXP] = msg.readInt32("job exp"); } - data.mAttributes[Attributes::PLAYER_JOB] =msg.readInt32("job level"); + data.mAttributes[Attributes::PLAYER_JOB_LEVEL] =msg.readInt32("job level"); msg.readInt16("shoes?"); const int gloves = msg.readInt16("gloves"); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 9106fce26..a16984cfa 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -704,7 +704,7 @@ void PlayerHandler::setStat(Net::MessageIn &msg, PlayerInfo::updateAttrs(); break; case Sp::JOBLEVEL: - PlayerInfo::setAttribute(Attributes::PLAYER_JOB, base); + PlayerInfo::setAttribute(Attributes::PLAYER_JOB_LEVEL, base); break; default: diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 474595bf0..8b0f960df 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -75,7 +75,8 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, data.mAttributes[Attributes::PLAYER_EXP] = msg.readInt32("base exp"); data.mAttributes[Attributes::MONEY] = msg.readInt32("money"); data.mAttributes[Attributes::PLAYER_JOB_EXP] = msg.readInt32("job exp"); - data.mAttributes[Attributes::PLAYER_JOB] = msg.readInt32("job level"); + data.mAttributes[Attributes::PLAYER_JOB_LEVEL] = + msg.readInt32("job level"); const int shoes = msg.readInt16("shoes"); const int gloves = msg.readInt16("gloves"); diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index e31539cd6..4d2e5cc33 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -405,7 +405,7 @@ void PlayerHandler::setStat(Net::MessageIn &msg, PlayerInfo::updateAttrs(); break; case Sp::JOBLEVEL: - PlayerInfo::setAttribute(Attributes::PLAYER_JOB, base); + PlayerInfo::setAttribute(Attributes::PLAYER_JOB_LEVEL, base); break; case Sp::GM_LEVEL: localPlayer->setGroupId(base); -- cgit v1.2.3-70-g09d2