Renamed {read,write}{Byte,Short,Long} to {read,write}{Int8,Int16,Int32}. This

is less confusing in 64-bit context and less conflicting with the 0.0 client.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index db07b786..b659f8a4 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -76,7 +76,7 @@ void TradeHandler::handleMessage(MessageIn &msg)
     {
         case GPMSG_TRADE_REQUEST:
         {
-            Being *being = beingManager->findBeing(msg.readShort());
+            Being *being = beingManager->findBeing(msg.readInt16());
             if (!being)
             {
                 Net::GameServer::Player::acceptTrade(false);
@@ -92,13 +92,13 @@ void TradeHandler::handleMessage(MessageIn &msg)
 
         case GPMSG_TRADE_ADD_ITEM:
         {
-            int type = msg.readShort();
-            int amount = msg.readByte();
+            int type = msg.readInt16();
+            int amount = msg.readInt8();
             tradeWindow->addItem(type, false, amount);
         }   break;
 
         case GPMSG_TRADE_SET_MONEY:
-            tradeWindow->setMoney(msg.readLong());
+            tradeWindow->setMoney(msg.readInt32());
             break;
 
         case GPMSG_TRADE_START: