summaryrefslogtreecommitdiff
path: root/src/resources/hairdb.h
diff options
context:
space:
mode:
authorPrzemysław Grzywacz <nexather@gmail.com>2013-05-24 18:55:53 +0200
committerPrzemysław Grzywacz <nexather@gmail.com>2013-05-24 18:55:53 +0200
commit05dc1666dc794ed6aa7f6568b768c652f8922c4e (patch)
treeaf83e22418e912e8eb8b2bc6b9595da344f461c1 /src/resources/hairdb.h
parent703cd73c0baa82d5f8ae3a1b390401f17de32f7a (diff)
parentf9cd8a5d6b4460ffcb945979d1e8cd8ebadc9b8d (diff)
downloadmana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.gz
mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.bz2
mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.xz
mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.zip
Merge remote-tracking branch 'origin/master' into lpc2012 branch
Diffstat (limited to 'src/resources/hairdb.h')
-rw-r--r--src/resources/hairdb.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/resources/hairdb.h b/src/resources/hairdb.h
index 700bd8b7..502d7c21 100644
--- a/src/resources/hairdb.h
+++ b/src/resources/hairdb.h
@@ -1,7 +1,7 @@
/*
* Hair database
* Copyright (C) 2008 Aethyra Development Team
- * Copyright (C) 2009-2012 The Mana Developers
+ * Copyright (C) 2009-2013 The Mana Developers
*
* This file is part of The Mana Client.
*
@@ -26,6 +26,7 @@
#include <map>
#include <string>
+#include "utils/xml.h"
/**
* Hair information database.
@@ -40,10 +41,11 @@ class HairDB
~HairDB()
{ unload(); }
- /**
- * Loads the color data from <code>hair.xml</code>.
- */
- void load();
+ void init();
+
+ void readHairColorNode(xmlNodePtr node, const std::string &filename);
+
+ void checkStatus();
/**
* Clear the color data