From 4f76de82c55e55cdaba1ddec85eb0d016b544633 Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Wed, 6 Jan 2010 20:43:18 -0500 Subject: Fixes so mapreader ignores the case of object types This will decrease warnings in the log file by a good bit --- src/resources/mapreader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/resources') diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 291dd732..60b5e9d2 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -241,8 +241,8 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) { if (xmlStrEqual(objectNode->name, BAD_CAST "object")) { - const std::string objType = - XML::getProperty(objectNode, "type", ""); + std::string objType = XML::getProperty(objectNode, "type", ""); + objType = toUpper(objType); if (objType == "WARP" || objType == "NPC" || objType == "SCRIPT" || objType == "SPAWN") @@ -251,8 +251,7 @@ Map *MapReader::readMap(xmlNodePtr node, const std::string &path) continue; } - const std::string objName = - XML::getProperty(objectNode, "name", ""); + const std::string objName = XML::getProperty(objectNode, "name", ""); const int objX = XML::getProperty(objectNode, "x", 0); const int objY = XML::getProperty(objectNode, "y", 0); -- cgit v1.2.3-70-g09d2