summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-19 00:11:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-19 00:11:08 +0300
commit1e0a3842186c86e40eff6fa7894e578ae948d179 (patch)
tree59e22da193009032e6e426d7a69d4bccb860691c
parent1b1cfaf22ab8281943abed6f909fc32f6da46e61 (diff)
downloadmanaplus-1e0a3842186c86e40eff6fa7894e578ae948d179.tar.gz
manaplus-1e0a3842186c86e40eff6fa7894e578ae948d179.tar.bz2
manaplus-1e0a3842186c86e40eff6fa7894e578ae948d179.tar.xz
manaplus-1e0a3842186c86e40eff6fa7894e578ae948d179.zip
Fix typo in chat object.
-rw-r--r--src/net/eathena/chathandler.cpp2
-rw-r--r--src/resources/chatobject.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 8b5d8683d..7c08cbc28 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -458,7 +458,7 @@ void ChatHandler::processChatDisplay(Net::MessageIn &msg)
const int len = msg.readInt16("len") - 17;
ChatObject *const obj = new ChatObject;
obj->ownerId = msg.readInt32("owner account id");
- obj->charId = msg.readInt32("char id");
+ obj->chatId = msg.readInt32("chat id");
obj->maxUsers = msg.readInt16("max users");
obj->currentUsers = msg.readInt16("current users");
obj->type = msg.readUInt8("type");
diff --git a/src/resources/chatobject.h b/src/resources/chatobject.h
index 1b86e88ad..f81718333 100644
--- a/src/resources/chatobject.h
+++ b/src/resources/chatobject.h
@@ -29,7 +29,7 @@ struct ChatObject final
{
ChatObject() :
ownerId(0),
- charId(0),
+ chatId(0),
maxUsers(0),
currentUsers(0),
type(0),
@@ -40,7 +40,7 @@ struct ChatObject final
A_DELETE_COPY(ChatObject)
int ownerId;
- int charId;
+ int chatId;
uint16_t maxUsers;
uint16_t currentUsers;
uint8_t type;