diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 19:32:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 19:32:59 +0300 |
| commit | 1b1a7cea1c6b81438bacc86b93cb80a78430790f (patch) | |
| tree | d23f4e0beea6b4e5c570afafd9ad9de6b68ba812 /src/resources/map | |
| parent | bb8be1acea37f09c134d7d4042869a679cf8a12b (diff) | |
| download | plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.gz plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.bz2 plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.xz plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.zip | |
Change namespace in resources loaders from other to Loader.
Diffstat (limited to 'src/resources/map')
| -rw-r--r-- | src/resources/map/map.cpp | 4 | ||||
| -rw-r--r-- | src/resources/map/mapitem.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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; } |