Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk

........
  r4013 | crush_tmw | 2008-04-01 01:18:19 +0200 (Di, 01 Apr 2008) | 1 line
  
  Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs.
........
  r4027 | crush_tmw | 2008-04-02 01:34:14 +0200 (Mi, 02 Apr 2008) | 1 line
  
  misspelled filename
........
  r4043 | b_lindeijer | 2008-04-07 10:37:23 +0200 (Mo, 07 Apr 2008) | 3 lines
  
  Added XML::Document class which simplifies parsing an XML document and
  automatically cleans it up again.
........
  r4174 | b_lindeijer | 2008-04-23 14:57:45 +0200 (Mi, 23 Apr 2008) | 2 lines
  
  Fixed svn:keywords properties and added header to guild.h.
........
  r4250 | crush_tmw | 2008-05-19 18:18:38 +0200 (Mo, 19 Mai 2008) | 1 line
  
  Added the possibility to add particle effects to NPCs in npcs.xml.
........
  r4254 | crush_tmw | 2008-05-20 15:58:26 +0200 (Di, 20 Mai 2008) | 1 line
  
  fixed some filename confusion messup in the last commit.
........


NOTE: This was my first commit using svnmerge. Please check if I did everything correctly.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 4f316875..531dfb3d 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -81,11 +81,10 @@ class SpriteDef : public Resource
         Action *getAction(SpriteAction action) const;
 
     private:
-
         /**
          * Constructor.
          */
-        SpriteDef(): mAction(NULL), mDirection(DIRECTION_DOWN), mLastTime(0) {}
+        SpriteDef() {}
 
         /**
          * Destructor.
@@ -149,9 +148,6 @@ class SpriteDef : public Resource
 
         ImageSets mImageSets;
         Actions mActions;
-        Action *mAction;
-        SpriteDirection mDirection;
-        int mLastTime;
 };
 
 #endif