From 3682f65a24ccd98b51f076ab3b89866ab363dd95 Mon Sep 17 00:00:00 2001 From: Eugenio Favalli Date: Mon, 6 Feb 2006 10:55:17 +0000 Subject: Updated Dev-Cpp project file, fixed a gcc 3.4 issue. --- src/net/tradehandler.cpp | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'src/net/tradehandler.cpp') diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 940c3e09..254ed3d1 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -66,25 +66,27 @@ void TradeHandler::handleMessage(MessageIn *msg) switch (msg->getId()) { case SMSG_TRADE_REQUEST: - // If a trade window or request window is already open, send a - // trade cancel to any other trade request. - // - // Note that it would be nice if the server would prevent this - // situation, and that the requesting player would get a - // special message about the player being occupied. - if (!player_node->tradeRequestOk()) { - player_node->tradeReply(false); - break; + // If a trade window or request window is already open, send a + // trade cancel to any other trade request. + // + // Note that it would be nice if the server would prevent this + // situation, and that the requesting player would get a + // special message about the player being occupied. + if (!player_node->tradeRequestOk()) + { + player_node->tradeReply(false); + break; + } + + player_node->setTrading(true); + tradePartnerName = msg->readString(24); + ConfirmDialog *dlg; + dlg = new ConfirmDialog("Request for trade", + tradePartnerName + + " wants to trade with you, do you accept?"); + dlg->addActionListener(&requestTradeListener); } - - player_node->setTrading(true); - tradePartnerName = msg->readString(24); - ConfirmDialog *dlg; - dlg = new ConfirmDialog("Request for trade", - tradePartnerName + - " wants to trade with you, do you accept?"); - dlg->addActionListener(&requestTradeListener); break; case SMSG_TRADE_RESPONSE: -- cgit v1.2.3-70-g09d2