Merge branch 'aethyra/master'

Conflicts:
	src/beingmanager.cpp
	src/gui/confirm_dialog.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/label.cpp
	src/gui/label.h
	src/gui/popup.cpp
	src/gui/popup.h
	src/gui/scrollarea.cpp
	src/gui/skin.cpp
	src/gui/skin.h
	src/gui/speechbubble.cpp
	src/gui/window.cpp
	src/gui/window.h
	src/localplayer.h
	src/main.cpp
	src/net/ea/playerhandler.cpp
	src/resources/ambientoverlay.h
	src/resources/dye.cpp
	src/resources/imagewriter.cpp
	src/resources/itemdb.cpp
	src/shopitem.cpp

3 files changed, 34 insertions, 13 deletions

diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 7ba6689f..aa4d6835 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -39,23 +39,35 @@ DyePalette::DyePalette(const std::string &description)
     int pos = 1;
     for (;;)
     {
-        if (pos + 6 > size) break;
+        if (pos + 6 > size)
+            break;
+
         int v = 0;
         for (int i = 0; i < 6; ++i)
         {
             char c = description[pos + i];
             int n;
-            if ('0' <= c && c <= '9') n = c - '0';
-            else if ('A' <= c && c <= 'F') n = c - 'A' + 10;
-            else if ('a' <= c && c <= 'f') n = c - 'a' + 10;
-            else goto error;
+
+            if ('0' <= c && c <= '9')
+                n = c - '0';
+            else if ('A' <= c && c <= 'F')
+                n = c - 'A' + 10;
+            else if ('a' <= c && c <= 'f')
+                n = c - 'a' + 10;
+            else
+                goto error;
+
             v = (v << 4) | n;
         }
         Color c = { { v >> 16, v >> 8, v } };
         mColors.push_back(c);
         pos += 6;
-        if (pos == size) return;
-        if (description[pos] != ',') break;
+
+        if (pos == size)
+            return;
+        if (description[pos] != ',')
+            break;
+
         ++pos;
     }
 
@@ -122,14 +134,18 @@ Dye::Dye(const std::string &description)
     {
         std::string::size_type pos = next_pos;
         next_pos = description.find(';', pos);
+
         if (next_pos == std::string::npos)
             next_pos = length;
+
         if (next_pos <= pos + 3 || description[pos + 1] != ':')
         {
             logger->log("Error, invalid dye: %s", description.c_str());
             return;
         }
+
         int i = 0;
+
         switch (description[pos])
         {
             case 'R': i = 0; break;
@@ -143,7 +159,8 @@ Dye::Dye(const std::string &description)
                 logger->log("Error, invalid dye: %s", description.c_str());
                 return;
         }
-        mDyePalettes[i] = new DyePalette(description.substr(pos + 2, next_pos - pos - 2));
+        mDyePalettes[i] = new DyePalette(description.substr(pos + 2,
+                                                            next_pos - pos - 2));
         ++next_pos;
     }
     while (next_pos < length);
@@ -180,8 +197,10 @@ void Dye::update(int color[3]) const
 void Dye::instantiate(std::string &target, const std::string &palettes)
 {
     std::string::size_type next_pos = target.find('|');
+
     if (next_pos == std::string::npos || palettes.empty())
         return;
+
     ++next_pos;
 
     std::ostringstream s;
@@ -191,8 +210,10 @@ void Dye::instantiate(std::string &target, const std::string &palettes)
     {
         std::string::size_type pos = next_pos;
         next_pos = target.find(';', pos);
+
         if (next_pos == std::string::npos)
             next_pos = last_pos;
+
         if (next_pos == pos + 1 && pal_pos != std::string::npos)
         {
             std::string::size_type pal_next_pos = palettes.find(';', pal_pos);
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index e1fe7c69..097e0c05 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -27,8 +27,7 @@
 #include <SDL.h>
 #include <string>
 
-bool ImageWriter::writePNG(SDL_Surface *surface,
-                           const std::string &filename)
+bool ImageWriter::writePNG(SDL_Surface *surface, const std::string &filename)
 {
     // TODO Maybe someone can make this look nice?
     FILE *fp = fopen(filename.c_str(), "wb");
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index ae2a08f9..50d7cf67 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -322,10 +322,11 @@ void MapReader::readLayer(xmlNodePtr node, Map *map)
     const int h = XML::getProperty(node, "height", map->getHeight());
     const int offsetX = XML::getProperty(node, "x", 0);
     const int offsetY = XML::getProperty(node, "y", 0);
-    const std::string name = XML::getProperty(node, "name", "");
+    std::string name = XML::getProperty(node, "name", "");
+    name = toLower(name);
 
-    const bool isFringeLayer = (name.substr(0,6) == "Fringe");
-    const bool isCollisionLayer = (name.substr(0,9) == "Collision");
+    const bool isFringeLayer = (name.substr(0,6) == "fringe");
+    const bool isCollisionLayer = (name.substr(0,9) == "collision");
 
     MapLayer *layer = 0;