diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-29 21:16:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-30 14:43:34 +0300 |
| commit | 9a39234015f092c5eb0f461da91689e71bf43943 (patch) | |
| tree | e798f45bc08f3015020972a2db0f015eb8cc0c42 /src/net | |
| parent | 23a3e48c33b14cc0bda0eb3fda361961e8d6172c (diff) | |
| download | plus-9a39234015f092c5eb0f461da91689e71bf43943.tar.gz plus-9a39234015f092c5eb0f461da91689e71bf43943.tar.bz2 plus-9a39234015f092c5eb0f461da91689e71bf43943.tar.xz plus-9a39234015f092c5eb0f461da91689e71bf43943.zip | |
Fix code style.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/chathandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/inventoryhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/tmwa/inventoryhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/tradehandler.cpp | 3 |
6 files changed, 3 insertions, 10 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 0ece76168..fc489a18a 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -32,7 +32,7 @@ #include "gui/windows/chatwindow.h" -#include "gui/widgets/tabs/chat/gmtab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "net/messagein.h" diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 9edbc4d67..a2e7c869e 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -22,11 +22,9 @@ #include "net/eathena/inventoryhandler.h" -#include "item.h" #include "notifymanager.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "enums/equipslot.h" diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 486d3dd30..984713cc8 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -40,8 +40,6 @@ #include "net/eathena/protocol.h" #include "net/eathena/inventoryhandler.h" -#include "utils/stringutils.h" - #include "resources/map/map.h" #include "debug.h" diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 4c6636727..e1e0464a0 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -32,7 +32,6 @@ #include "gui/widgets/createwidget.h" #include "net/character.h" -#include "net/serverfeatures.h" #include "net/ea/token.h" diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 7c40df902..6097f515d 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -22,14 +22,11 @@ #include "net/tmwa/inventoryhandler.h" -#include "item.h" - #include "notifymanager.h" #include "enums/equipslot.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "enums/resources/notifytypes.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 76a8903d6..c445f8d06 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -259,7 +259,8 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg) void TradeHandler::processTradeResponse(Net::MessageIn &msg) { if (tradePartnerName.empty() || - !player_relations.hasPermission(tradePartnerName, PlayerRelation::TRADE)) + !player_relations.hasPermission(tradePartnerName, + PlayerRelation::TRADE)) { tradeHandler->respond(false); return; |