summaryrefslogtreecommitdiff
path: root/src/net/tmwa/tradehandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-20 00:15:42 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-20 00:15:42 +0300
commitf96919885dd0e5ae0de4a8517e76419304ca8d36 (patch)
tree2c39f6da9bd97c45d77c77f1b9ee0505f38be0e6 /src/net/tmwa/tradehandler.cpp
parent1dbf1cf1d87a38a327673b69c184ad662bd12cc4 (diff)
downloadmanaplus-f96919885dd0e5ae0de4a8517e76419304ca8d36.tar.gz
manaplus-f96919885dd0e5ae0de4a8517e76419304ca8d36.tar.bz2
manaplus-f96919885dd0e5ae0de4a8517e76419304ca8d36.tar.xz
manaplus-f96919885dd0e5ae0de4a8517e76419304ca8d36.zip
Fix code style.
Diffstat (limited to 'src/net/tmwa/tradehandler.cpp')
-rw-r--r--src/net/tmwa/tradehandler.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index f43c5b266..e48536874 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -30,7 +30,6 @@
#include "being/playerrelation.h"
#include "being/playerrelations.h"
-#include "gui/windows/confirmdialog.h"
#include "gui/windows/tradewindow.h"
#include "net/serverfeatures.h"
@@ -49,7 +48,6 @@
extern Net::TradeHandler *tradeHandler;
extern std::string tradePartnerName;
-extern ConfirmDialog *confirmDlg;
namespace TmwAthena
{
@@ -277,9 +275,8 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg)
void TradeHandler::processTradeResponse(Net::MessageIn &msg)
{
- if (confirmDlg || tradePartnerName.empty()
- || !player_relations.hasPermission(tradePartnerName,
- PlayerRelation::TRADE))
+ if (tradePartnerName.empty() ||
+ !player_relations.hasPermission(tradePartnerName, PlayerRelation::TRADE))
{
tradeHandler->respond(false);
return;