diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 14:13:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 14:13:51 +0300 |
| commit | e2f03241a1ba9d6b536b0b7a6f995e4e8d894408 (patch) | |
| tree | 2bfd5cda7899a5793de62b5f47925a09eac320f5 /src/resources/item | |
| parent | 59271755dc75f5de6c288308df92f687deaa32b4 (diff) | |
| download | mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.gz mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.bz2 mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.xz mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.zip | |
Move images load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/item')
| -rw-r--r-- | src/resources/item/item.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp index d62d9aaf1..8400e2675 100644 --- a/src/resources/item/item.cpp +++ b/src/resources/item/item.cpp @@ -30,7 +30,7 @@ #include "resources/iteminfo.h" -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/imageloader.h" #include "net/serverfeatures.h" @@ -100,7 +100,7 @@ void Item::setId(const int id, const std::string dye = combineDye2(paths.getStringValue( "itemIcons").append(info.getDisplay().image), info.getDyeIconColorsString(color)); - mImage = resourceManager->getImage(dye); + mImage = ImageLoader::getImage(dye); if (!mImage) { @@ -121,7 +121,7 @@ Image *Item::getImage(const int id, const ItemColor color) { const ItemInfo &info = ItemDB::get(id); - Image *image = resourceManager->getImage(combineDye2(paths.getStringValue( + Image *image = ImageLoader::getImage(combineDye2(paths.getStringValue( "itemIcons").append(info.getDisplay().image), info.getDyeIconColorsString(color))); |