summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-29 21:16:55 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-30 14:43:34 +0300
commit9a39234015f092c5eb0f461da91689e71bf43943 (patch)
treee798f45bc08f3015020972a2db0f015eb8cc0c42 /src/net/tmwa
parent23a3e48c33b14cc0bda0eb3fda361961e8d6172c (diff)
downloadmanaplus-9a39234015f092c5eb0f461da91689e71bf43943.tar.gz
manaplus-9a39234015f092c5eb0f461da91689e71bf43943.tar.bz2
manaplus-9a39234015f092c5eb0f461da91689e71bf43943.tar.xz
manaplus-9a39234015f092c5eb0f461da91689e71bf43943.zip
Fix code style.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/charserverhandler.cpp1
-rw-r--r--src/net/tmwa/inventoryhandler.cpp3
-rw-r--r--src/net/tmwa/tradehandler.cpp3
3 files changed, 2 insertions, 5 deletions
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;