Merge branch 'master' of gitorious.org:mana/manaserv

Conflicts:
	src/game-server/itemmanager.cpp

2 files changed, 39 insertions, 0 deletions

diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 659f928..8bc9ebe 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -96,6 +96,35 @@ namespace XML
         return mDoc ? xmlDocGetRootElement(mDoc) : 0;
     }
 
+    bool hasProperty(xmlNodePtr node, const char *name)
+    {
+        xmlChar *prop = xmlGetProp(node, BAD_CAST name);
+        if (prop)
+        {
+            xmlFree(prop);
+            return true;
+        }
+
+        return false;
+    }
+
+    bool getBoolProperty(xmlNodePtr node, const char *name, bool def)
+    {
+        bool ret = def;
+        xmlChar *prop = xmlGetProp(node, BAD_CAST name);
+        if (prop)
+        {
+            if (xmlStrEqual(prop, BAD_CAST "true")
+                ||xmlStrEqual(prop, BAD_CAST "yes"))
+                ret = true;
+            if (xmlStrEqual(prop, BAD_CAST "false")
+                ||xmlStrEqual(prop, BAD_CAST "no"))
+                ret = false;
+            xmlFree(prop);
+        }
+        return ret;
+    }
+
     int getProperty(xmlNodePtr node, const char *name, int def)
     {
         int &ret = def;
diff --git a/src/utils/xml.hpp b/src/utils/xml.hpp
index ee37b48..eba88e5 100644
--- a/src/utils/xml.hpp
+++ b/src/utils/xml.hpp
@@ -70,6 +70,16 @@ namespace XML
     };
 
     /**
+     * Tells if a property from an xmlNodePtr exists.
+     */
+    bool hasProperty(xmlNodePtr node, const char *name);
+
+    /**
+     * Gets a boolean property from an xmlNodePtr.
+     */
+    bool getBoolProperty(xmlNodePtr node, const char *name, bool def);
+
+    /**
      * Gets an integer property from an xmlNodePtr.
      */
     int getProperty(xmlNodePtr node, const char *name, int def);