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/map.cpp | |
| 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/map/map.cpp')
| -rw-r--r-- | src/resources/map/map.cpp | 6 |
1 files changed, 3 insertions, 3 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) |