From 8da32105732949b4b0273c718d118bcfae70a1c9 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 11 Dec 2006 15:47:35 +0000
Subject: Merged 0.0 changes from revision 2825 to 2898 to trunk.

---
 src/player.h | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/player.h')

diff --git a/src/player.h b/src/player.h
index 3c061be6..b062a55f 100644
--- a/src/player.h
+++ b/src/player.h
@@ -26,12 +26,14 @@
 
 #include "being.h"
 
-#include <string>
-
 class Graphics;
 class Map;
-class AnimatedSprite;
 
+/**
+ * A player being. Players have their name drawn beneath them. This class also
+ * implements player-specific loading of base sprite, hair sprite and equipment
+ * sprites.
+ */
 class Player : public Being
 {
     public:
@@ -56,18 +58,10 @@ class Player : public Being
         setHairStyle(Uint16 style);
 
         virtual void
-        setVisibleEquipment(Uint8 slot, Uint8 id);
+        setVisibleEquipment(Uint8 slot, int id);
 
         virtual void
         setWeapon(Uint16 weapon);
-
-    private:
-        /**
-         * Resets all animations associated with this player. This is used to
-         * synchronize the animations after a new one has been added.
-         */
-        void
-        resetAnimations();
 };
 
 #endif
-- 
cgit v1.2.3-60-g2f50