diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
| commit | cc79f0fe21e1a2ef73cbe987d54e848b9a47142d (patch) | |
| tree | edd316eb6094f0c02d6d014385865dcd88a2bc56 /src/net/ea/tradehandler.cpp | |
| parent | b0df784f1be44a657ca8092069488602270629b7 (diff) | |
| parent | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (diff) | |
| download | mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.gz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.bz2 mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.xz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.zip | |
Merge branch 'eathena/master'
Conflicts:
A lot of files.
Diffstat (limited to 'src/net/ea/tradehandler.cpp')
| -rw-r--r-- | src/net/ea/tradehandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 6c953a11..78472083 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -140,8 +140,8 @@ void TradeHandler::handleMessage(MessageIn &msg) case SMSG_TRADE_ITEM_ADD: { - Sint32 amount = msg.readInt32(); - Sint16 type = msg.readInt16(); + int amount = msg.readInt32(); + int type = msg.readInt16(); msg.readInt8(); // identified flag msg.readInt8(); // attribute msg.readInt8(); // refine @@ -166,7 +166,7 @@ void TradeHandler::handleMessage(MessageIn &msg) tradeWindow->receivedOk(true); return; } - Sint16 quantity = msg.readInt16(); + int quantity = msg.readInt16(); switch (msg.readInt8()) { |