From bfbb797e6c528e0650826e917d498c52362abbb0 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Mar 2007 16:24:43 +0000
Subject: Merged 0.0 changes from revision 3177 to 3234 to trunk.

---
 src/resources/spritedef.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/resources/spritedef.h')

diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 057129ad..6d335b02 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -32,7 +32,7 @@
 #include <libxml/tree.h>
 
 class Action;
-class Spriteset;
+class ImageSet;
 
 enum SpriteAction
 {
@@ -111,7 +111,7 @@ class SpriteDef : public Resource
          */
         void
         loadAnimation(xmlNodePtr animationNode,
-                      Action *action, Spriteset *imageset,
+                      Action *action, ImageSet *imageSet,
                       int variant_offset);
 
         /**
@@ -140,12 +140,12 @@ class SpriteDef : public Resource
         makeSpriteDirection(const std::string &direction);
 
 
-        typedef std::map<std::string, Spriteset*> Spritesets;
-        typedef Spritesets::iterator SpritesetIterator;
+        typedef std::map<std::string, ImageSet*> ImageSets;
+        typedef ImageSets::iterator ImageSetIterator;
 
         typedef std::map<SpriteAction, Action*> Actions;
 
-        Spritesets mSpritesets;
+        ImageSets mImageSets;
         Actions mActions;
         Action *mAction;
         SpriteDirection mDirection;
-- 
cgit v1.2.3-70-g09d2