Relaxed collision and fringe naming slightly so that they just need to

start with collision or fringe, instead of being required to be the
same case throughout the beginning of the layer name.

Also made a default name for popup menus so that their skins can also be
changed by users.

Signed-off-by: Ira Rice <irarice@gmail.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index fd2a0361..13adf827 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -48,7 +48,7 @@
 extern std::string tradePartnerName;
 
 PopupMenu::PopupMenu():
-    Window(),
+    Window("PopupMenu"),
     mBeingId(0),
     mFloorItem(NULL),
     mItem(NULL)
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 901a2561..e40acd77 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;