Fixed display of trade window. Completed trade protocol.

3 files changed, 9 insertions, 1 deletions

diff --git a/src/net/gameserver/player.cpp b/src/net/gameserver/player.cpp
index feba5565..95f7dff9 100644
--- a/src/net/gameserver/player.cpp
+++ b/src/net/gameserver/player.cpp
@@ -140,6 +140,13 @@ void Net::GameServer::Player::tradeItem(int slot, int amount)
     Net::GameServer::connection->send(msg);
 }
 
+void Net::GameServer::Player::tradeMoney(int amount)
+{
+    MessageOut msg(PGMSG_TRADE_SET_MONEY);
+    msg.writeLong(amount);
+    Net::GameServer::connection->send(msg);
+}
+
 void Net::GameServer::Player::tradeWithNPC(int item, int amount)
 {
     MessageOut msg(PGMSG_NPC_BUYSELL);
diff --git a/src/net/gameserver/player.h b/src/net/gameserver/player.h
index dcf3f267..b5f3e6d7 100644
--- a/src/net/gameserver/player.h
+++ b/src/net/gameserver/player.h
@@ -49,6 +49,7 @@ namespace Net
             void requestTrade(int id);
             void acceptTrade(bool accept);
             void tradeItem(int slot, int amount);
+            void tradeMoney(int amount);
             void tradeWithNPC(int item, int amount);
         }
     }
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 52553e94..db07b786 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -108,7 +108,7 @@ void TradeHandler::handleMessage(MessageIn &msg)
             break;
 
         case GPMSG_TRADE_ACCEPT:
-            tradeWindow->receivedOk(false);
+            tradeWindow->receivedOk();
             break;
 
         case GPMSG_TRADE_CANCEL: