Made Being::mDirection protected, forcing the use of setDirection. Defaulted

variant argument to 0 since this is the most common situation. Some SpriteDef
refactoring, splitting up the loading into several methods, in preparation of
adding support for including other sprites.

1 files changed, 28 insertions, 0 deletions

diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 51c47a24..64414259 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -29,6 +29,8 @@
 #include <map>
 #include <string>
 
+#include <libxml/tree.h>
+
 class Action;
 class Graphics;
 class Spriteset;
@@ -96,6 +98,32 @@ class SpriteDef : public Resource
         load(const std::string &file, int variant);
 
         /**
+         * Loads an imageset element.
+         */
+        void
+        loadImageSet(xmlNodePtr node);
+
+        /**
+         * Loads an action element.
+         */
+        void
+        loadAction(xmlNodePtr node, int variant_offset);
+
+        /**
+         * Loads an animation element.
+         */
+        void
+        loadAnimation(xmlNodePtr animationNode,
+                      Action *action, Spriteset *imageset,
+                      int variant_offset);
+
+        /**
+         * Include another sprite into this one.
+         */
+        void
+        includeSprite(xmlNodePtr includeNode);
+
+        /**
          * When there are no animations defined for the action "complete", its
          * animations become a copy of those of the action "with".
          */