diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-12 17:07:09 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-12 17:07:09 +0300 |
commit | 566ae30ff94caf6c92fc7d64f021b567933f8a60 (patch) | |
tree | eae43b8899444f99a97fdd00bc5df8a117c316e9 /src/net/tmwa | |
parent | 247418a3ec0b50479c7bac80322202b01527ae61 (diff) | |
download | manaverse-566ae30ff94caf6c92fc7d64f021b567933f8a60.tar.gz manaverse-566ae30ff94caf6c92fc7d64f021b567933f8a60.tar.bz2 manaverse-566ae30ff94caf6c92fc7d64f021b567933f8a60.tar.xz manaverse-566ae30ff94caf6c92fc7d64f021b567933f8a60.zip |
fix code style.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/adminhandler.cpp | 3 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/mailhandler.cpp | 3 | ||||
-rw-r--r-- | src/net/tmwa/mailhandler.h | 1 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
6 files changed, 5 insertions, 8 deletions
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 2e98504c7..fb7b284d0 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -44,7 +44,8 @@ namespace TmwAthena { AdminHandler::AdminHandler() : - MessageHandler() + MessageHandler(), + Ea::AdminHandler() { static const uint16_t _messages[] = { diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 195579946..75f1e2875 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -810,7 +810,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const requestNameById(id); } - uint8_t dir = dstBeing->getDirectionDelayed(); + const uint8_t dir = dstBeing->getDirectionDelayed(); if (dir) { if (dir != dstBeing->getDirection()) diff --git a/src/net/tmwa/mailhandler.cpp b/src/net/tmwa/mailhandler.cpp index 1e80f817c..b018a0ce1 100644 --- a/src/net/tmwa/mailhandler.cpp +++ b/src/net/tmwa/mailhandler.cpp @@ -20,9 +20,6 @@ #include "net/tmwa/mailhandler.h" -#include "net/tmwa/messageout.h" -#include "net/tmwa/protocol.h" - #include "debug.h" extern Net::MailHandler *mailHandler; diff --git a/src/net/tmwa/mailhandler.h b/src/net/tmwa/mailhandler.h index f90415086..2336dac1b 100644 --- a/src/net/tmwa/mailhandler.h +++ b/src/net/tmwa/mailhandler.h @@ -27,7 +27,6 @@ namespace TmwAthena { -class MessageOut; class MailHandler final : public MessageHandler, public Net::MailHandler { diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 4aa1bfadd..547803354 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -48,4 +48,4 @@ bool ServerFeatures::haveChangePartyLeader() const return false; } -} // TmwAthena +} // namespace TmwAthena diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index f934c31e2..4fad87256 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -41,6 +41,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveChangePartyLeader() const override final; }; -} // namespace Net +} // namespace TmwAthena #endif // NET_TMWA_SERVERFEATURES_H |