summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-27 23:13:28 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-27 23:13:28 +0300
commitf70dcfe0a82db3aee879953f117d12aecc4fce85 (patch)
tree0e0e4deac4c18ff478bdc42aba4ee3c834ae1390 /src/net
parent9429dc4f5b5b6102a8b575de25ce5d8e7170551f (diff)
downloadmv-f70dcfe0a82db3aee879953f117d12aecc4fce85.tar.gz
mv-f70dcfe0a82db3aee879953f117d12aecc4fce85.tar.bz2
mv-f70dcfe0a82db3aee879953f117d12aecc4fce85.tar.xz
mv-f70dcfe0a82db3aee879953f117d12aecc4fce85.zip
Rename Attributes::PLAYER_JOB to Attributes::PLAYER_JOB_LEVEL.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/charserverrecv.cpp2
-rw-r--r--src/net/eathena/playerhandler.cpp2
-rw-r--r--src/net/tmwa/charserverrecv.cpp3
-rw-r--r--src/net/tmwa/playerhandler.cpp2
4 files changed, 5 insertions, 4 deletions
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);