Merge branch 'master' into lpc2012

This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581.

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

1 files changed, 25 insertions, 1 deletions

diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index ce193821..7c5f5c88 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -38,6 +38,8 @@
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
 
+#include "resources/attributes.h"
+#include "resources/chardb.h"
 #include "resources/hairdb.h"
 
 #include "utils/dtor.h"
@@ -278,7 +280,17 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *window)
     const Token &token =
             static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
 
-    mCharCreateDialog->setAttributes(attributes, 30, 1, 9);
+    unsigned minStat = CharDB::getMinStat();
+    if (minStat == 0)
+        minStat = Attributes::getAttributeMinimum();
+    unsigned maxStat = CharDB::getMaxStat();
+    if (maxStat == 0)
+        maxStat = Attributes::getAttributeMaximum();
+    unsigned sumStat = CharDB::getSumStat();
+    if (sumStat == 0)
+        sumStat = Attributes::getCreationPoints();
+
+    mCharCreateDialog->setAttributes(attributes, sumStat, minStat, maxStat);
     mCharCreateDialog->setFixedGender(true, token.sex);
 }
 
@@ -342,6 +354,18 @@ unsigned int CharServerHandler::maxSprite() const
     return SPRITE_VECTOREND;
 }
 
+int CharServerHandler::getCharCreateMaxHairColorId() const
+{
+    const int max = CharDB::getMaxHairColor();
+    return max ? max : 11; // default maximum
+}
+
+int CharServerHandler::getCharCreateMaxHairStyleId() const
+{
+    const int max = CharDB::getMaxHairStyle();
+    return max ? max : 19; // default maximum
+}
+
 void CharServerHandler::connect()
 {
     const Token &token =