diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
| commit | da05d9dd98315378bdded216184294f376643191 (patch) | |
| tree | ffc4b984c73c3bb68d26a1df6481634254075744 /src/resources/map/map.cpp | |
| parent | ec856b2026c7ceecab5f74942bb36661d7c6ae67 (diff) | |
| download | manaplus-da05d9dd98315378bdded216184294f376643191.tar.gz manaplus-da05d9dd98315378bdded216184294f376643191.tar.bz2 manaplus-da05d9dd98315378bdded216184294f376643191.tar.xz manaplus-da05d9dd98315378bdded216184294f376643191.zip | |
Use resource manager as global variable.
Diffstat (limited to 'src/resources/map/map.cpp')
| -rw-r--r-- | src/resources/map/map.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index b96abc7d2..cc2d3487a 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -222,8 +222,6 @@ void Map::optionChanged(const std::string &value) void Map::initializeAmbientLayers() { - ResourceManager *const resman = ResourceManager::getInstance(); - // search for "foreground*" or "overlay*" (old term) in map properties for (int i = 0; /* terminated by a break */; i++) { @@ -243,7 +241,8 @@ void Map::initializeAmbientLayers() break; // the FOR loop } - Image *const img = resman->getImage(getProperty(name + "image")); + Image *const img = resourceManager->getImage( + getProperty(name + "image")); if (img) { int mask = atoi(getProperty(name + "mask").c_str()); @@ -270,7 +269,8 @@ void Map::initializeAmbientLayers() toString(i)).append("image")); i ++) { const std::string name("background" + toString(i)); - Image *const img = resman->getImage(getProperty(name + "image")); + Image *const img = resourceManager->getImage( + getProperty(name + "image")); if (img) { |