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, 3 insertions, 16 deletions

diff --git a/src/being.cpp b/src/being.cpp
index 73c9ed62..a9dfa93c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -127,23 +127,10 @@ Being::setPath(const Path &path)
 }
 
 void
-Being::setHairColor(Uint16 color)
+Being::setHairStyle(int style, int color)
 {
-    mHairColor = color;
-    if (mHairColor < 1 || mHairColor > NR_HAIR_COLORS + 1)
-    {
-        mHairColor = 1;
-    }
-}
-
-void
-Being::setHairStyle(Uint16 style)
-{
-    mHairStyle = style;
-    if (mHairStyle < 1 || mHairStyle > NR_HAIR_STYLES)
-    {
-        mHairStyle = 1;
-    }
+    mHairStyle = style < 0 ? mHairStyle : style % NR_HAIR_STYLES;
+    mHairColor = color < 0 ? mHairColor : color % NR_HAIR_COLORS;
 }
 
 void