diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
| commit | de51eaa43e05c2126fc1eef2a7e115843f972547 (patch) | |
| tree | 286a05a069e048247f90c7595f1b8939be784608 /src/net/manaserv/tradehandler.cpp | |
| parent | d4c08d3bf69410a35a50875de50cc6fe74b3bf3e (diff) | |
| parent | 8627c7745f47492ab349da6a74e98e3d5813418f (diff) | |
| download | manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.gz manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.bz2 manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.xz manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.zip | |
Merge branch 'coloritems'
Diffstat (limited to 'src/net/manaserv/tradehandler.cpp')
| -rw-r--r-- | src/net/manaserv/tradehandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp index 18a60a424..cd3a21aca 100644 --- a/src/net/manaserv/tradehandler.cpp +++ b/src/net/manaserv/tradehandler.cpp @@ -134,7 +134,7 @@ void TradeHandler::handleMessage(Net::MessageIn &msg) { int type = msg.readInt16(); int amount = msg.readInt8(); - tradeWindow->addItem(type, false, amount, 0); + tradeWindow->addItem(type, false, amount, 0, 1); } break; case GPMSG_TRADE_SET_MONEY: @@ -201,7 +201,7 @@ void TradeHandler::addItem(Item *item, int amount) msg.writeInt8(amount); gameServerConnection->send(msg); - tradeWindow->addItem(item->getId(), true, amount, 0); + tradeWindow->addItem(item->getId(), true, amount, 0, 1); item->increaseQuantity(-amount); } |