summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-12 11:48:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-12 11:48:22 +0300
commit7ff1b993bfc1e65a2e2d44bbcfc6444421aa69a2 (patch)
treef9bdd4dfe3460026feb1ad9ed3fad75a72ad136c /src/net/eathena
parent1aedc45da834c18cd33d04be0fe43245518192ff (diff)
downloadplus-7ff1b993bfc1e65a2e2d44bbcfc6444421aa69a2.tar.gz
plus-7ff1b993bfc1e65a2e2d44bbcfc6444421aa69a2.tar.bz2
plus-7ff1b993bfc1e65a2e2d44bbcfc6444421aa69a2.tar.xz
plus-7ff1b993bfc1e65a2e2d44bbcfc6444421aa69a2.zip
eathena: fix reading characters list for account.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/charserverhandler.cpp9
-rw-r--r--src/net/eathena/packets.h2
2 files changed, 5 insertions, 6 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index a4908413d..ab815c37f 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -193,11 +193,8 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
tempPlayer->setManner(msg.readInt32("manner"));
msg.readInt16("left points");
- data.mAttributes[Attributes::HP] = msg.readInt16("hp");
- data.mAttributes[Attributes::MAX_HP] = msg.readInt16("max hp");
-
- msg.readInt32("unused");
-
+ data.mAttributes[Attributes::HP] = msg.readInt32("hp");
+ data.mAttributes[Attributes::MAX_HP] = msg.readInt32("max hp");
data.mAttributes[Attributes::MP] = msg.readInt16("mp/sp");
data.mAttributes[Attributes::MAX_MP] = msg.readInt16("max mp/sp");
@@ -250,6 +247,8 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
msg.readInt32("robe");
msg.readInt32("slot change");
tempPlayer->setRename(msg.readInt32("rename (inverse)"));
+ // +++ here need use gender
+ msg.readUInt8("gender");
}
void CharServerHandler::chooseCharacter(Net::Character *const character)
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index 11f928ff7..6d7a99762 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -46,7 +46,7 @@ int16_t packet_lengths[] =
// #0x0040
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 50, 3, -1, 55, 17, 3, 37, 46, -1, 23, -1, 3, 146, 3, 2,
+ 0, 50, 3, -1, 55, 17, 3, 37, 46, -1, 23, -1, 3, 149, 3, 2,
3, 28, 19, 11, 3, -1, 9, 5, 55, 53, 58, 60, 44, 2, 6, 6,
// #0x0080
7, 3, 2, 2, 2, 5, 16, 12, 10, 7, 29, 23, -1, -1, -1, 0,