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/map | |
| parent | 59271755dc75f5de6c288308df92f687deaa32b4 (diff) | |
| download | plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.gz plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.bz2 plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.xz plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.zip | |
Move images load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/map')
| -rw-r--r-- | src/resources/map/map.cpp | 6 | ||||
| -rw-r--r-- | src/resources/map/mapitem.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 7fde6a005..a5e14fc10 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -52,7 +52,7 @@ #include "resources/map/mapobjectlist.h" #include "resources/map/tileanimation.h" -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/imageloader.h" #ifdef USE_OPENGL #include "render/renderers.h" @@ -236,7 +236,7 @@ void Map::initializeAmbientLayers() restrict2 break; // the FOR loop } - Image *restrict const img = resourceManager->getImage( + Image *restrict const img = ImageLoader::getImage( getProperty(name + "image")); if (img) { @@ -266,7 +266,7 @@ void Map::initializeAmbientLayers() restrict2 toString(i)).append("image")); i ++) { const std::string name("background" + toString(i)); - Image *restrict const img = resourceManager->getImage( + Image *restrict const img = ImageLoader::getImage( getProperty(name + "image")); if (img) diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 58a105ab9..6443bb196 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -29,7 +29,7 @@ #include "resources/image.h" -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/imageloader.h" #include "render/graphics.h" @@ -115,7 +115,7 @@ void MapItem::setType(const int type) } if (!name.empty()) - mImage = resourceManager->getImage(name); + mImage = ImageLoader::getImage(name); else mImage = nullptr; } |