* Use hair.xml to determine hair colours (#514)

* Auto-detect number of hair styles available (#514)

Conflicts:

	ChangeLog
	src/being.cpp
	src/being.h
	src/gui/char_select.cpp

(cherry picked from eAthena client)

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 3adfbc08..67cb3c7b 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -266,7 +266,8 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     Window(_("Create Character"), true, parent), mSlot(slot)
 {
     mPlayer = new Player(0, 0, NULL);
-    mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % NR_HAIR_COLORS);
+    mPlayer->setHairStyle(rand() % Being::getHairStylesNr(),
+                          rand() % Being::getHairColorsNr());
     mPlayer->setGender(GENDER_MALE);
 
     mNameField = new TextField("");
@@ -422,13 +423,13 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         mPlayer->setHairStyle(-1, mPlayer->getHairColor() + 1);
     }
     else if (event.getId() == "prevcolor") {
-        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + NR_HAIR_COLORS - 1);
+        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + Being::getHairColorsNr() - 1);
     }
     else if (event.getId() == "nextstyle") {
         mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, -1);
     }
     else if (event.getId() == "prevstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() + NR_HAIR_STYLES - 1, -1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + Being::getHairStylesNr() - 1, -1);
     }
     else if (event.getId() == "statslider") {
         UpdateSliders();