Merged revisions 3642,3662-3664,3667 via svnmerge from

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

........
  r3642 | gmelquio | 2007-10-19 19:46:46 +0200 (Fri, 19 Oct 2007) | 1 line
  
  Factored code between resource handlers. Implemented failure-friendly sprite loader.
........
  r3662 | gmelquio | 2007-10-21 21:01:16 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Added persistent positioning.
........
  r3663 | gmelquio | 2007-10-21 21:03:43 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Fixed missing pixels at bottom and right.
........
  r3664 | gmelquio | 2007-10-21 21:05:56 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Changed to use default values when restoring missing settings.
........
  r3667 | gmelquio | 2007-10-21 22:09:08 +0200 (Sun, 21 Oct 2007) | 1 line
  
  Fixed invisible text in dropboxes and shopboxes.
........

1 files changed, 15 insertions, 12 deletions

diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 55d7f459..121f23cc 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -71,28 +71,26 @@ class SpriteDef : public Resource
 {
     public:
         /**
-         * Constructor.
+         * Loads a sprite definition file.
          */
-        SpriteDef(const std::string &idPath,
-                  const std::string &file, int variant);
+        static SpriteDef *load(std::string const &file, int variant);
 
         /**
-         * Destructor.
+         * Returns the specified action.
          */
-        ~SpriteDef();
+        Action *getAction(SpriteAction action) const;
+
+    private:
 
         /**
-         * Returns the specified action.
+         * Constructor.
          */
-        Action*
-        getAction(SpriteAction action) const;
+        SpriteDef(): mAction(NULL), mDirection(DIRECTION_DOWN), mLastTime(0) {}
 
-    private:
         /**
-         * Loads a sprite definition file.
+         * Destructor.
          */
-        void
-        load(const std::string &file, int variant);
+        ~SpriteDef();
 
         /**
          * Loads an imageset element.
@@ -121,6 +119,11 @@ class SpriteDef : public Resource
         includeSprite(xmlNodePtr includeNode);
 
         /**
+         * Complete missing actions by copying existing ones.
+         */
+        void substituteActions();
+
+        /**
          * When there are no animations defined for the action "complete", its
          * animations become a copy of those of the action "with".
          */