From 05a12d5568111fa13759026442ed358605bf9a28 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Thu, 23 Feb 2006 16:02:00 +0000 Subject: A bunch of mostly cosmetic cleanups. --- src/gui/minimap.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src/gui/minimap.cpp') diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 1165d7bb..e19a8c62 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -26,10 +26,8 @@ #include "../being.h" #include "../beingmanager.h" #include "../graphics.h" -#include "../map.h" #include "../resources/image.h" -#include "../resources/resourcemanager.h" Minimap::Minimap(): Window("Map"), @@ -48,32 +46,23 @@ Minimap::~Minimap() } } -void Minimap::setMap(Map *map) +void Minimap::setMapImage(Image *img) { if (mMapImage) { mMapImage->decRef(); } - if (map->hasProperty("minimap")) - { - ResourceManager *resman = ResourceManager::getInstance(); - mMapImage = resman->getImage(map->getProperty("minimap")); + mMapImage = img; - if (mMapImage != NULL) - { - setVisible(true); - mMapImage->setAlpha(0.7); - } - else - { - setVisible(false); - } + if (mMapImage) + { + setVisible(true); + mMapImage->setAlpha(0.7); } else { setVisible(false); - mMapImage = NULL; } } -- cgit v1.2.3-60-g2f50