diff options
| -rw-r--r-- | src/actions/actions.cpp | 4 | ||||
| -rw-r--r-- | src/flooritem.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popups/itempopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 2 | ||||
| -rw-r--r-- | src/item.cpp | 4 |
5 files changed, 5 insertions, 9 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index d2fc1c4c8..ee5a2481e 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -1480,10 +1480,6 @@ impHandler0(createItems) if (id <= 500) continue; - int colors = info->getColorsSize(); - if (colors >= 255) - colors = 254; - dialog->addItem(id, 0, ItemColor_one, 100, 0); } dialog->sort(); diff --git a/src/flooritem.cpp b/src/flooritem.cpp index 4680a29b7..4d549ba0a 100644 --- a/src/flooritem.cpp +++ b/src/flooritem.cpp @@ -106,7 +106,7 @@ void FloorItem::postInit(Map *const map, int subX, int subY) setupSpriteDisplay(info.getDisplay(), ForceDisplay_true, 1, - info.getDyeColorsString(mColor)); + info.getDyeIconColorsString(mColor)); } void FloorItem::setCards(const int *const cards, diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index ceb32cdaf..a97b2480b 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -178,7 +178,7 @@ void ItemPopup::setItem(const ItemInfo &item, ResourceManager *const resman = ResourceManager::getInstance(); Image *const image = resman->getImage(combineDye2( paths.getStringValue("itemIcons").append( - item.getDisplay().image), item.getDyeColorsString(color))); + item.getDisplay().image), item.getDyeIconColorsString(color))); mIcon->setImage(image); if (image) diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index 351a09112..1ba871cd6 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -113,7 +113,7 @@ MailViewWindow::MailViewWindow(const MailMessage *const message) : Image *const image = resman->getImage(combineDye2( paths.getStringValue("itemIcons").append( item.getDisplay().image), - item.getDyeColorsString(ItemColor_one))); + item.getDyeIconColorsString(ItemColor_one))); mIcon = new Icon(this, image); if (message->itemAmount != 1) diff --git a/src/item.cpp b/src/item.cpp index a03cb4437..9a2537b18 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -98,7 +98,7 @@ void Item::setId(const int id, const std::string dye = combineDye2(paths.getStringValue( "itemIcons").append(info.getDisplay().image), - info.getDyeColorsString(color)); + info.getDyeIconColorsString(color)); mImage = resman->getImage(dye); if (!mImage) @@ -123,7 +123,7 @@ Image *Item::getImage(const int id, const ItemInfo &info = ItemDB::get(id); Image *image = resman->getImage(combineDye2(paths.getStringValue( "itemIcons").append(info.getDisplay().image), - info.getDyeColorsString(color))); + info.getDyeIconColorsString(color))); if (!image) image = Theme::getImageFromTheme("unknown-item.png"); |