summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-24 21:33:13 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-24 23:28:10 +0300
commit64810ef5b4b3d375e7af0f4fc9ee69e235afa568 (patch)
tree6810d0f27a0e38c99370c3c9e8d08443ffe8d76f /src/net/eathena
parent9d2eb460fa3569342044b6f3e61d52d86ca8cbb6 (diff)
downloadplus-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.gz
plus-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.bz2
plus-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.xz
plus-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.zip
Fix code style.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/chathandler.cpp2
-rw-r--r--src/net/eathena/loginhandler.cpp3
-rw-r--r--src/net/eathena/playerhandler.cpp1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 1ff0e9035..b36bfa2e4 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -984,7 +984,7 @@ void ChatHandler::processChatRoomSettings(Net::MessageIn &msg)
const int chatId = msg.readInt32("chat id");
const uint16_t limit = msg.readInt16("limit");
msg.readInt16("users");
- const uint16_t type = msg.readUInt8("type");
+ const uint8_t type = msg.readUInt8("type");
const std::string &title = msg.readString(sz, "title");
ChatObject *const chat = localPlayer->getChat();
if (chat && chat->chatId == chatId)
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 6d8e892e9..573b5212c 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -136,7 +136,8 @@ void LoginHandler::disconnect()
}
void LoginHandler::changePassword(const std::string &restrict oldPassword,
- const std::string &restrict newPassword) const
+ const std::string &restrict newPassword)
+ const
{
if (!serverFeatures->haveChangePassword())
return;
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index aa0cb4f20..2a087ee6a 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -276,6 +276,7 @@ void PlayerHandler::changeAction(const BeingAction::Action &action) const
type = 2;
break;
case BeingAction::STAND:
+ case BeingAction::PRESTAND:
type = 3;
break;
default: