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, 9 insertions, 15 deletions

diff --git a/src/being.h b/src/being.h
index 6c123377..2770dd6b 100644
--- a/src/being.h
+++ b/src/being.h
@@ -33,7 +33,7 @@
 #include "map.h"
 #include "animatedsprite.h"
 
-#define NR_HAIR_STYLES 7
+#define NR_HAIR_STYLES 8
 #define NR_HAIR_COLORS 10
 
 class AnimatedSprite;
@@ -183,28 +183,22 @@ class Being : public Sprite
         setName(const std::string &name) { mName = name; }
 
         /**
-         * Sets the hair color for this being.
-         */
-        virtual void
-        setHairColor(Uint16 color);
-
-        /**
          * Gets the hair color for this being.
          */
-        Uint16
-        getHairColor() const { return mHairColor; }
+        int getHairColor() const
+        { return mHairColor; }
 
         /**
-         * Sets the hair style for this being.
+         * Gets the hair style for this being.
          */
-        virtual void
-        setHairStyle(Uint16 style);
+        int getHairStyle() const
+        { return mHairStyle; }
 
         /**
-         * Gets the hair style for this being.
+         * Sets the hair style and color for this being.
          */
-        Uint16
-        getHairStyle() const { return mHairStyle; }
+        virtual void
+        setHairStyle(int style, int color);
 
         /**
          * Sets visible equipments for this being.