aboutsummaryrefslogtreecommitdiff
path: root/src/game/TradeHandler.cpp
diff options
context:
space:
mode:
authormaximius <none@none>2009-09-14 16:50:01 -0700
committermaximius <none@none>2009-09-14 16:50:01 -0700
commit6cb428318af4aba5ebb9d9340284165ca6181065 (patch)
tree9aee2db05975f78bf96fc0bbfff47a5fa4fca112 /src/game/TradeHandler.cpp
parent33f8f5ac2d2b99819ce7e0f4aad4fa0648eba35e (diff)
parent140ec674a040bdc04086472330a289c2d15ecc65 (diff)
*Merge..
--HG-- branch : trunk
Diffstat (limited to 'src/game/TradeHandler.cpp')
-rw-r--r--src/game/TradeHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp
index 3044e8a3b51..66781c1b63b 100644
--- a/src/game/TradeHandler.cpp
+++ b/src/game/TradeHandler.cpp
@@ -594,7 +594,7 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
// check cheating, can't fail with correct client operations
Item* item = _player->GetItemByPos(bag,slot);
- if (!item || (tradeSlot != TRADE_SLOT_NONTRADED && !item->CanBeTraded()))
+ if(!item || tradeSlot!=TRADE_SLOT_NONTRADED && !item->CanBeTraded())
{
SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
return;