summaryrefslogtreecommitdiff
path: root/src/net/eathena/itemhandler.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/itemhandler.cpp
parent37eb9896130e6606c93166d29c595480e02a785b (diff)
downloadmanaplus-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.tar.gz
manaplus-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.tar.bz2
manaplus-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.tar.xz
manaplus-ead2b06e3496b0cbe3a4a4c33a55c8262f02b73f.zip
In all places try get item color from ItemColorManager.
Diffstat (limited to 'src/net/eathena/itemhandler.cpp')
-rw-r--r--src/net/eathena/itemhandler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp
index 909d6d312..6bb541649 100644
--- a/src/net/eathena/itemhandler.cpp
+++ b/src/net/eathena/itemhandler.cpp
@@ -23,6 +23,7 @@
#include "net/eathena/itemhandler.h"
#include "actormanager.h"
+#include "itemcolormanager.h"
#include "logger.h"
#include "net/eathena/protocol.h"
@@ -141,7 +142,7 @@ void ItemHandler::processItemDropped2(Net::MessageIn &msg)
itemType,
amount,
refine,
- ItemColor_one,
+ ItemColorManager::getColorFromCards(&cards[0]),
identified,
subX, subY,
&cards[0]);
@@ -226,7 +227,7 @@ void ItemHandler::processItemVisible2(Net::MessageIn &msg)
itemType,
amount,
refine,
- ItemColor_one,
+ ItemColorManager::getColorFromCards(&cards[0]),
identified,
subX, subY,
&cards[0]);