summaryrefslogtreecommitdiff
path: root/src/resources/chardb.h
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
committerReid <reidyaro@gmail.com>2012-01-25 22:05:36 +0100
commit8b612abb42853a22c1a9545e2c9280d154646543 (patch)
treef466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/resources/chardb.h
parenta913dd41df61760de6ece552f941e002251ff54c (diff)
parentd340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff)
downloadplus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2
plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz
plus-8b612abb42853a22c1a9545e2c9280d154646543.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/resources/chardb.h')
-rw-r--r--src/resources/chardb.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/chardb.h b/src/resources/chardb.h
index 769dedb56..60ff31084 100644
--- a/src/resources/chardb.h
+++ b/src/resources/chardb.h
@@ -1,7 +1,7 @@
/*
* Color database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2011 The ManaPlus Developers
+ * Copyright (C) 2011-2012 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
*
@@ -25,7 +25,7 @@
#include <map>
#include <string>
-#include <libxml/tree.h>
+#include "utils/xml.h"
/**
* Char information database.
@@ -42,7 +42,7 @@ namespace CharDB
*/
void unload();
- void loadMinMax(xmlNodePtr node, unsigned *min, unsigned *max);
+ void loadMinMax(XmlNodePtr node, unsigned *min, unsigned *max);
unsigned getMinHairColor();