Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27

Conflicts:
	data/Makefile.am

1 files changed, 16 insertions, 3 deletions

diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 42435f036..d621caa96 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -44,6 +44,7 @@
 #include "net/messageout.h"
 #include "net/net.h"
 
+#include "resources/chardb.h"
 #include "resources/colordb.h"
 #include "resources/itemdb.h"
 
@@ -66,10 +67,18 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot):
     mPlayer = new Being(0, ActorSprite::PLAYER, mRace, nullptr);
     mPlayer->setGender(GENDER_MALE);
 
-    int numberOfHairColors = ColorDB::getHairSize();
+    maxHairColor = CharDB::getMaxHairColor();
+    minHairColor = CharDB::getMinHairColor();
+    if (!maxHairColor)
+        maxHairColor = ColorDB::getHairSize();
 
-    mHairStyle = rand() % mPlayer->getNumOfHairstyles();
-    mHairColor = rand() % numberOfHairColors;
+    maxHairStyle = CharDB::getMaxHairStyle();
+    minHairStyle = CharDB::getMinHairStyle();
+    if (!maxHairStyle)
+        maxHairStyle = mPlayer->getNumOfHairstyles();
+
+    mHairStyle = (rand() % maxHairStyle) + minHairStyle;
+    mHairColor = (rand() % maxHairColor) + minHairColor;
     updateHair();
 
     mNameField = new TextField("");
@@ -408,10 +417,14 @@ void CharCreateDialog::updateHair()
     mHairStyle %= Being::getNumOfHairstyles();
     if (mHairStyle < 0)
         mHairStyle += Being::getNumOfHairstyles();
+    if (mHairStyle < (signed)minHairStyle || mHairStyle > (signed)maxHairStyle)
+        mHairStyle = minHairStyle;
 
     mHairColor %= ColorDB::getHairSize();
     if (mHairColor < 0)
         mHairColor += ColorDB::getHairSize();
+    if (mHairColor < (signed)minHairColor || mHairColor > (signed)maxHairColor)
+        mHairColor = minHairColor;
 
     mPlayer->setSprite(Net::getCharHandler()->hairSprite(),
                        mHairStyle * -1, ColorDB::getHairColor(mHairColor));