From 1b1a7cea1c6b81438bacc86b93cb80a78430790f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 May 2016 19:32:59 +0300 Subject: Change namespace in resources loaders from other to Loader. --- src/resources/map/map.cpp | 4 ++-- src/resources/map/mapitem.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/resources/map') diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index a5e14fc10..98a29a8e8 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -236,7 +236,7 @@ void Map::initializeAmbientLayers() restrict2 break; // the FOR loop } - Image *restrict const img = ImageLoader::getImage( + Image *restrict const img = Loader::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 = ImageLoader::getImage( + Image *restrict const img = Loader::getImage( getProperty(name + "image")); if (img) diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 6443bb196..eb7676342 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -115,7 +115,7 @@ void MapItem::setType(const int type) } if (!name.empty()) - mImage = ImageLoader::getImage(name); + mImage = Loader::getImage(name); else mImage = nullptr; } -- cgit v1.2.3-70-g09d2