Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(dynamic recoloring of sprites and related changes)

........
  r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Fixed double load of hair graphics.
........
  r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Added automatic recoloring of images. Inspired by fungos' ideas (PR #41).
........
  r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Experimented recoloring on scorpions.
........
  r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Tightened palette handling.
........
  r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Experimented with scorpions again.
........
  r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Applied recoloring to hair styles.
........
  r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Converted slimes to recoloring.
........
  r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line
  
  Sped up recoloring of transparent pixels.
........

1 files changed, 5 insertions, 8 deletions

diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 90dd53be..8ab3b879 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -256,8 +256,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
 {
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setGender(gender);
-    mPlayer->setHairStyle(rand() % NR_HAIR_STYLES + 1);
-    mPlayer->setHairColor(rand() % NR_HAIR_COLORS + 1);
+    mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % NR_HAIR_COLORS);
 
     mNameField = new TextField("");
     mNameLabel = new gcn::Label("Name:");
@@ -338,18 +337,16 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         scheduleDelete();
     }
     else if (event.getId() == "nextcolor") {
-        mPlayer->setHairColor(mPlayer->getHairColor() % NR_HAIR_COLORS + 1);
+        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + 1);
     }
     else if (event.getId() == "prevcolor") {
-        int prevColor = mPlayer->getHairColor() + NR_HAIR_COLORS - 2;
-        mPlayer->setHairColor(prevColor % NR_HAIR_COLORS + 1);
+        mPlayer->setHairStyle(-1, mPlayer->getHairColor() + NR_HAIR_COLORS - 1);
     }
     else if (event.getId() == "nextstyle") {
-        mPlayer->setHairStyle(mPlayer->getHairStyle() % NR_HAIR_STYLES + 1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + 1, -1);
     }
     else if (event.getId() == "prevstyle") {
-        int prevStyle = mPlayer->getHairStyle() + NR_HAIR_STYLES - 2;
-        mPlayer->setHairStyle(prevStyle % NR_HAIR_STYLES + 1);
+        mPlayer->setHairStyle(mPlayer->getHairStyle() + NR_HAIR_STYLES - 1, -1);
     }
 }