Merged revisions 3762-3772,3776-3782 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3762 | crush_tmw | 2007-12-04 00:25:25 +0100 (Tue, 04 Dec 2007) | 1 line
  
   Added/renamed some headgears for the christmas event.
........
  r3763 | crush_tmw | 2007-12-04 14:51:20 +0100 (Tue, 04 Dec 2007) | 1 line
  
  tophead -> tophat
........
  r3764 | b_lindeijer | 2007-12-05 21:20:25 +0100 (Wed, 05 Dec 2007) | 3 lines
  
  Fix drawing of very high fringe tiles by keeping track of the maximum tile
  height.
........
  r3765 | crush_tmw | 2007-12-07 01:50:15 +0100 (Fri, 07 Dec 2007) | 1 line
  
  Added a new drop item for the christmas event.
........
  r3768 | crush_tmw | 2007-12-09 20:45:53 +0100 (Sun, 09 Dec 2007) | 1 line
  
  New versions of funky hat and elf hat by QOAL.
........
  r3769 | crush_tmw | 2007-12-10 03:22:59 +0100 (Mon, 10 Dec 2007) | 1 line
  
  Simplified player subsprite handling by treating equipment, hairstyle and base sprites alike. Implementing female hairstyles is now a purely content-sided task.
........
  r3770 | crush_tmw | 2007-12-10 03:50:15 +0100 (Mon, 10 Dec 2007) | 1 line
  
  Added an option to show log messages in the chat console.
........
  r3771 | crush_tmw | 2007-12-10 17:12:56 +0100 (Mon, 10 Dec 2007) | 1 line
  
  Implemented female hairstyles.
........
  r3772 | b_lindeijer | 2007-12-10 21:42:11 +0100 (Mon, 10 Dec 2007) | 2 lines
  
  Include cassert header.
........
  r3777 | crush_tmw | 2007-12-14 18:33:45 +0100 (Fri, 14 Dec 2007) | 1 line
  
  Fixed some errors with the filenames of the new items (unrelated to my eAthena problems).
........
  r3778 | crush_tmw | 2007-12-14 19:21:39 +0100 (Fri, 14 Dec 2007) | 1 line
  
  fixed some more screwups with the new items.
........
  r3780 | crush_tmw | 2007-12-14 19:40:12 +0100 (Fri, 14 Dec 2007) | 1 line
  
  Put new items in equipment.xml for backward compatibility with the last client release.
........
  r3782 | b_lindeijer | 2007-12-17 16:59:04 +0100 (Mon, 17 Dec 2007) | 2 lines
  
  Fixed the item tags.
........

1 files changed, 11 insertions, 1 deletions

diff --git a/src/being.cpp b/src/being.cpp
index 22c56a6d..20684d8d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -61,7 +61,9 @@ Being::Being(int id, int job, Map *map):
     mEquippedWeapon(NULL),
     mSpeechTime(0),
     mPx(0), mPy(0),
-    mSprites(VECTOREND_SPRITE, NULL)
+    mSprites(VECTOREND_SPRITE, NULL),
+    mSpriteIDs(VECTOREND_SPRITE, 0),
+    mSpriteColors(VECTOREND_SPRITE, "")
 {
     setMap(map);
 
@@ -286,6 +288,14 @@ Being::setPath(const Path &path, int mod)
 }
 
 void
+Being::setSprite(int slot, int id, const std::string &color)
+{
+    assert(slot >= BASE_SPRITE && slot < VECTOREND_SPRITE);
+    mSpriteIDs[slot] = id;
+    mSpriteColors[slot] = color;
+}
+
+void
 Being::setSpeech(const std::string &text, Uint32 time)
 {
     mSpeech = text;