From da05d9dd98315378bdded216184294f376643191 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Aug 2015 14:14:34 +0300
Subject: Use resource manager as global variable.

---
 src/item.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/item.cpp')

diff --git a/src/item.cpp b/src/item.cpp
index 50ccf374a..9a534cfad 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -93,14 +93,13 @@ void Item::setId(const int id,
     if (mImage)
         mImage->decRef();
 
-    ResourceManager *const resman = ResourceManager::getInstance();
     const ItemInfo &info = getInfo();
     mTags = info.getTags();
 
     const std::string dye = combineDye2(paths.getStringValue(
         "itemIcons").append(info.getDisplay().image),
         info.getDyeIconColorsString(color));
-    mImage = resman->getImage(dye);
+    mImage = resourceManager->getImage(dye);
 
     if (!mImage)
     {
@@ -120,9 +119,8 @@ bool Item::isHaveTag(const int tagId) const
 Image *Item::getImage(const int id,
                       const ItemColor color)
 {
-    ResourceManager *const resman = ResourceManager::getInstance();
     const ItemInfo &info = ItemDB::get(id);
-    Image *image = resman->getImage(combineDye2(paths.getStringValue(
+    Image *image = resourceManager->getImage(combineDye2(paths.getStringValue(
         "itemIcons").append(info.getDisplay().image),
         info.getDyeIconColorsString(color)));
 
-- 
cgit v1.2.3-60-g2f50