diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-04-24 21:33:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-04-24 23:28:10 +0300 |
| commit | 64810ef5b4b3d375e7af0f4fc9ee69e235afa568 (patch) | |
| tree | 6810d0f27a0e38c99370c3c9e8d08443ffe8d76f /src/net | |
| parent | 9d2eb460fa3569342044b6f3e61d52d86ca8cbb6 (diff) | |
| download | manaverse-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.gz manaverse-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.bz2 manaverse-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.xz manaverse-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.zip | |
Fix code style.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/chathandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/loginhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 1 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 78e95be55..f5285e8ef 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -23,7 +23,6 @@ #include "net/ea/beinghandler.h" #include "actormanager.h" -#include "configuration.h" #include "game.h" #include "party.h" @@ -34,7 +33,6 @@ #include "gui/windows/botcheckerwindow.h" #include "gui/windows/socialwindow.h" -#include "gui/windows/killstats.h" #include "resources/mapitemtype.h" 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: diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 7ef97647e..580b4b3f2 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -34,7 +34,6 @@ #include "input/keyboardconfig.h" -#include "gui/windows/killstats.h" #include "gui/windows/outfitwindow.h" #include "gui/windows/socialwindow.h" diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 48f86daa9..cc11aa8ba 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -202,6 +202,7 @@ void PlayerHandler::changeAction(const BeingAction::Action &action) const type = 2; break; case BeingAction::STAND: + case BeingAction::PRESTAND: type = 3; break; default: |