summaryrefslogtreecommitdiff
path: root/src/net/eathena/tradehandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-16 23:35:37 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-16 23:35:37 +0300
commitead2b06e3496b0cbe3a4a4c33a55c8262f02b73f (patch)
tree1017b9434f0bf905423f22b39fc683075040ac83 /src/net/eathena/tradehandler.cpp
parent37eb9896130e6606c93166d29c595480e02a785b (diff)
downloadManaVerse-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.tar.gz
ManaVerse-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.tar.bz2
ManaVerse-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.tar.xz
ManaVerse-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.zip
In all places try get item color from ItemColorManager.
Diffstat (limited to 'src/net/eathena/tradehandler.cpp')
-rw-r--r--src/net/eathena/tradehandler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index a76a08130..bc416cff6 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -24,6 +24,7 @@
#include "inventory.h"
#include "item.h"
+#include "itemcolormanager.h"
#include "notifymanager.h"
#include "being/playerinfo.h"
@@ -206,7 +207,7 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
false,
amount,
refine,
- ItemColor_one,
+ ItemColorManager::getColorFromCards(&cards[0]),
fromBool(identify, Identified),
Damaged_false,
Favorite_false,