diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-03-24 16:24:43 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-03-24 16:24:43 +0000 |
| commit | bfbb797e6c528e0650826e917d498c52362abbb0 (patch) | |
| tree | 8d111b92eefe8451a66b57599217829b4127318e /src/engine.cpp | |
| parent | dae5c721bf974792db526f1d736384d95a75635e (diff) | |
| download | mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.gz mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.bz2 mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.xz mana-bfbb797e6c528e0650826e917d498c52362abbb0.zip | |
Merged 0.0 changes from revision 3177 to 3234 to trunk.
Diffstat (limited to 'src/engine.cpp')
| -rw-r--r-- | src/engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index a3097d49..31bec9ff 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -44,7 +44,6 @@ #include "resources/mapreader.h" #include "resources/monsterdb.h" #include "resources/resourcemanager.h" -#include "resources/spriteset.h" #include "utils/dtor.h" #include "utils/tostring.h" @@ -77,7 +76,8 @@ void Engine::changeMap(const std::string &mapPath) // Notify the minimap and beingManager about the map change Image *mapImage = NULL; - if (newMap->hasProperty("minimap")) { + if (newMap->hasProperty("minimap")) + { ResourceManager *resman = ResourceManager::getInstance(); mapImage = resman->getImage(newMap->getProperty("minimap")); } |