From 05a12d5568111fa13759026442ed358605bf9a28 Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Thu, 23 Feb 2006 16:02:00 +0000
Subject: A bunch of mostly cosmetic cleanups.

---
 src/engine.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/engine.cpp')

diff --git a/src/engine.cpp b/src/engine.cpp
index 4a637777..879a6b21 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -136,7 +136,12 @@ void Engine::changeMap(std::string mapPath)
     std::string oldMusic = "";
 
     // Notify the minimap and beingManager about the map change
-    minimap->setMap(newMap);
+    Image *mapImage = NULL;
+    if (newMap->hasProperty("minimap")) {
+        ResourceManager *resman = ResourceManager::getInstance();
+        mapImage = resman->getImage(newMap->getProperty("minimap"));
+    }
+    minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
 
     if (mCurrentMap) {
@@ -252,7 +257,7 @@ void Engine::draw(Graphics *graphics)
 
     // Draw player nickname, speech, and emotion sprite as needed
     Beings *beings = beingManager->getAll();
-    for (Beings::iterator i = beings->begin(); i != beings->end(); i++)
+    for (BeingIterator i = beings->begin(); i != beings->end(); i++)
     {
         (*i)->drawSpeech(graphics, -map_x, -map_y);
         (*i)->drawName(graphics, -map_x, -map_y);
-- 
cgit v1.2.3-70-g09d2