Merge branch 'master' into lpc2012

This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581.

Conflicts:
	src/gui/charcreatedialog.cpp
	src/net/manaserv/manaserv_protocol.h

1 files changed, 68 insertions, 0 deletions

diff --git a/src/resources/attributes.h b/src/resources/attributes.h
new file mode 100644
index 00000000..7124ba94
--- /dev/null
+++ b/src/resources/attributes.h
@@ -0,0 +1,68 @@
+/*
+ *  The Mana Client
+ *  Copyright (C) 2010-2013  The Mana Developers
+ *
+ *  This file is part of The Mana Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_ATTRIBUTES_H
+#define RESOURCES_ATTRIBUTES_H
+
+#include <string>
+#include <vector>
+
+namespace Attributes {
+
+    void load();
+
+    void unload();
+
+    void informItemDB();
+
+    void informStatusWindow();
+
+    /**
+     * Returns the list of base attribute labels.
+     */
+    std::vector<std::string>& getLabels();
+
+    /**
+     * Give back the corresponding playerinfo Id from the attribute id
+     * defined in the xml file.
+     */
+    int getPlayerInfoIdFromAttrId(int attrId);
+
+    /**
+     * Give the attribute points given to a character
+     * at its creation.
+     */
+    unsigned int getCreationPoints();
+
+    /**
+     * Give the minimum attribute point possible
+     * at character's creation.
+     */
+    unsigned int getAttributeMinimum();
+
+    /**
+     * Give the maximum attribute point possible
+     * at character's creation.
+     */
+    unsigned int getAttributeMaximum();
+
+} // namespace Attributes
+
+#endif // RESOURCES_ATTRIBUTES_H