Fixing code style and adding configuration option for extented minimaps.

1 files changed, 42 insertions, 21 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 9efacdce6..1dd9ba54e 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -94,31 +94,52 @@ void Minimap::setMap(Map *map)
         mMapImage = 0;
     }
 
-    if (true/* TODO replace this with an option*/) {
-       // should this optionally happen only if there is no resourcemanager option? i.e. a tristate always, fallback, never?
-       SDL_Surface* surface = SDL_CreateRGBSurface(SDL_SWSURFACE, map->getWidth(), map->getHeight(), 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000);
-       // I'm not sure if the locks are necessary since it's a SWSURFACE
-       SDL_LockSurface(surface);
-       int* data = (int*)surface->pixels;
-       for (int y = 0; y < surface->h; y++)
-           for (int x = 0; x < surface->w; x++)
-               *(data++) = -map->getWalk(x,y);
-        SDL_UnlockSurface(surface);
-        mMapImage = Image::load(surface);
-        SDL_FreeSurface(surface);
-    }
-    else if (map)
+    if (map)
     {
-        std::string tempname =
-            "graphics/minimaps/" + map->getFilename() + ".png";
-        ResourceManager *resman = ResourceManager::getInstance();
+        if (config.getBoolValue("showExtMinimaps"))
+        {
+            SDL_Surface* surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
+                map->getWidth(), map->getHeight(), 32,
+                0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000);
+            if (!surface)
+            {
+                if (!isSticky())
+                    setVisible(false);
+                return;
+            }
+
+            // I'm not sure if the locks are necessary since it's a SWSURFACE
+            SDL_LockSurface(surface);
+            int* data = (int*)surface->pixels;
+            if (!data)
+            {
+                if (!isSticky())
+                    setVisible(false);
+                return;
+            }
+            for (int y = 0; y < surface->h; y ++)
+            {
+                for (int x = 0; x < surface->w; x ++)
+                    *(data ++) = -map->getWalk(x,y);
+            }
+            SDL_UnlockSurface(surface);
 
-        minimapName = map->getProperty("minimap");
+            mMapImage = Image::load(surface);
+            SDL_FreeSurface(surface);
+        }
+        else
+        {
+            std::string tempname =
+                "graphics/minimaps/" + map->getFilename() + ".png";
+            ResourceManager *resman = ResourceManager::getInstance();
+
+            minimapName = map->getProperty("minimap");
 
-        if (minimapName.empty() && resman->exists(tempname))
-            minimapName = tempname;
+            if (minimapName.empty() && resman->exists(tempname))
+                minimapName = tempname;
 
-        mMapImage = resman->getImage(minimapName);
+            mMapImage = resman->getImage(minimapName);
+        }
     }
 
     if (mMapImage && map)