summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index 2de3c282..6aff0dc9 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -123,11 +123,6 @@ Engine::~Engine()
delete itemDb;
}
-Map *Engine::getCurrentMap()
-{
- return mCurrentMap;
-}
-
void Engine::changeMap(std::string mapPath)
{
// Clean up floor items
@@ -149,9 +144,6 @@ void Engine::changeMap(std::string mapPath)
logger->error("Could not find map file");
}
- // Start playing new music file when necessary
- std::string oldMusic = "";
-
// Notify the minimap and beingManager about the map change
Image *mapImage = NULL;
if (newMap->hasProperty("minimap")) {
@@ -161,6 +153,9 @@ void Engine::changeMap(std::string mapPath)
minimap->setMapImage(mapImage);
beingManager->setMap(newMap);
+ // Start playing new music file when necessary
+ std::string oldMusic = "";
+
if (mCurrentMap) {
oldMusic = mCurrentMap->getProperty("music");
delete mCurrentMap;