summaryrefslogtreecommitdiff
path: root/src/net/tradehandler.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-21 16:30:11 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-21 16:30:11 +0000
commita5e6a44b51d4269ed6812c9a9e0b6a293d959a4d (patch)
treef269a803b58b47082156dc74bb0d6e8e2dc6519e /src/net/tradehandler.cpp
parent1f6975d34e2c6fe8404fcbe13da406e624d94b68 (diff)
downloadmana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.tar.gz
mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.tar.bz2
mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.tar.xz
mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.zip
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.
Diffstat (limited to 'src/net/tradehandler.cpp')
-rw-r--r--src/net/tradehandler.cpp8
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: