summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/map.cpp6
-rw-r--r--src/resources/map/mapitem.cpp4
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;
}