Merged 0.0 changes from revision 2898 to 2988 to trunk.

15 files changed, 329 insertions, 32 deletions

diff --git a/src/resources/action.cpp b/src/resources/action.cpp
new file mode 100644
index 00000000..247455db
--- /dev/null
+++ b/src/resources/action.cpp
@@ -0,0 +1,67 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "action.h"
+
+#include <algorithm>
+
+#include "animation.h"
+
+#include "../utils/dtor.h"
+
+
+Action::Action()
+{
+}
+
+Action::~Action()
+{
+    std::for_each(mAnimations.begin(), mAnimations.end(),
+                  make_dtor(mAnimations));
+}
+
+Animation*
+Action::getAnimation(int direction) const
+{
+    Animations::const_iterator i = mAnimations.find(direction);
+
+    // When the direction isn't defined, try the default
+    if (i == mAnimations.end())
+    {
+        i = mAnimations.find(0);
+    }
+
+    return (i == mAnimations.end()) ? NULL : i->second;
+}
+
+void
+Action::setAnimation(int direction, Animation *animation)
+{
+    // Set first direction as default direction
+    if (mAnimations.empty())
+    {
+        mAnimations[0] = animation;
+    }
+
+    mAnimations[direction] = animation;
+}
diff --git a/src/resources/action.h b/src/resources/action.h
new file mode 100644
index 00000000..8d5e8d11
--- /dev/null
+++ b/src/resources/action.h
@@ -0,0 +1,61 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_ACTION_H
+#define _TMW_ACTION_H
+
+#include <map>
+
+#include <libxml/tree.h>
+
+class Animation;
+
+/**
+ * An action consists of several animations, one for each direction.
+ */
+class Action
+{
+    public:
+        /**
+         * Constructor.
+         */
+        Action();
+
+        /**
+         * Destructor.
+         */
+        ~Action();
+
+        void
+        setAnimation(int direction, Animation *animation);
+
+        Animation*
+        getAnimation(int direction) const;
+
+    protected:
+        typedef std::map<int, Animation*> Animations;
+        typedef Animations::iterator AnimationIterator;
+        Animations mAnimations;
+};
+
+#endif
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
new file mode 100644
index 00000000..de96525c
--- /dev/null
+++ b/src/resources/animation.cpp
@@ -0,0 +1,53 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "animation.h"
+
+#include <algorithm>
+
+#include "../utils/dtor.h"
+
+Animation::Animation():
+    mDuration(0)
+{
+}
+
+void
+Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY)
+{
+    Frame frame = { image, delay, offsetX, offsetY };
+    mFrames.push_back(frame);
+    mDuration += delay;
+}
+
+void
+Animation::addTerminator()
+{
+    addFrame(NULL, 0, 0, 0);
+}
+
+bool
+Animation::isTerminator(const Frame &candidate)
+{
+    return (candidate.image == NULL);
+}
diff --git a/src/resources/animation.h b/src/resources/animation.h
new file mode 100644
index 00000000..54142bcb
--- /dev/null
+++ b/src/resources/animation.h
@@ -0,0 +1,99 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_ANIMATION_H
+#define _TMW_ANIMATION_H
+
+#include <vector>
+
+#include <libxml/tree.h>
+
+class Image;
+class Spriteset;
+
+/**
+ * A single frame in an animation, with a delay and an offset.
+ */
+struct Frame
+{
+    Image *image;
+    unsigned int delay;
+    int offsetX;
+    int offsetY;
+};
+
+/**
+ * An animation consists of several frames, each with their own delay and
+ * offset.
+ */
+class Animation
+{
+    public:
+        /**
+         * Constructor.
+         */
+        Animation();
+
+        /**
+         * Appends a new animation at the end of the sequence
+         */
+        void
+        addFrame(Image *image, unsigned int delay, int offsetX, int offsetY);
+
+        /**
+         * Appends an animation terminator that states that the animation
+         * should not loop.
+         */
+        void
+        addTerminator();
+
+        /**
+         * Returns the frame at the specified index.
+         */
+        Frame*
+        getFrame(int index) { return &(mFrames[index]); }
+
+        /**
+         * Returns the length of this animation in frames.
+         */
+        unsigned int
+        getLength() const { return mFrames.size(); }
+
+        /**
+         * Returns the duration of this animation.
+         */
+        int
+        getDuration() const { return mDuration; }
+
+        /**
+         * Determines whether the given animation frame is a terminator.
+         */
+        static bool
+        isTerminator(const Frame &phase);
+
+    protected:
+        std::vector<Frame> mFrames;
+        int mDuration;
+};
+
+#endif
diff --git a/src/resources/equipmentdb.cpp b/src/resources/equipmentdb.cpp
index 78ae3b6a..52a9fbd3 100644
--- a/src/resources/equipmentdb.cpp
+++ b/src/resources/equipmentdb.cpp
@@ -40,6 +40,9 @@ namespace
 void

 EquipmentDB::load()

 {

+    if (mLoaded)

+        return;

+

     logger->log("Initializing equipment database...");

     mUnknown.setSprite("error.xml", 0);

     mUnknown.setSprite("error.xml", 1);

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 48818f6f..9398e06b 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -153,10 +153,10 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     SDL_FreeSurface(image);
 
     if (hasPink && !hasAlpha) {
-        SDL_SetColorKey(tmpImage, SDL_SRCCOLORKEY | SDL_RLEACCEL,
+        SDL_SetColorKey(tmpImage, SDL_SRCCOLORKEY,
                 SDL_MapRGB(tmpImage->format, 255, 0, 255));
     } else if (hasAlpha) {
-        SDL_SetAlpha(tmpImage, SDL_SRCALPHA | SDL_RLEACCEL, SDL_ALPHA_OPAQUE);
+        SDL_SetAlpha(tmpImage, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
     }
 
 #ifdef USE_OPENGL
@@ -305,7 +305,7 @@ void Image::setAlpha(float a)
 
     if (mImage) {
         // Set the alpha value this image is drawn at
-        SDL_SetAlpha(mImage, SDL_SRCALPHA | SDL_RLEACCEL, (int)(255 * mAlpha));
+        SDL_SetAlpha(mImage, SDL_SRCALPHA, (int) (255 * mAlpha));
     }
 }
 
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index b91e34cc..f914af47 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -37,11 +37,15 @@ namespace
 {

     ItemDB::ItemInfos mItemInfos;

     ItemInfo mUnknown;

+    bool mLoaded = false;

 }

 

 

 void ItemDB::load()

 {

+    if (mLoaded)

+        return;

+

     logger->log("Initializing item database...");

     mUnknown.setName("Unknown item");

 

@@ -150,6 +154,8 @@ void ItemDB::load()
     }

 

     xmlFreeDoc(doc);

+

+    mLoaded = true;

 }

 

 void ItemDB::unload()

@@ -159,6 +165,8 @@ void ItemDB::unload()
         delete i->second;

     }

     mItemInfos.clear();

+

+    mLoaded = false;

 }

 

 const ItemInfo&

diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 5922984a..c080194b 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -29,17 +29,17 @@
 #include <map>

 

 /**

- * The namespace that holds the item information

+ * The namespace that holds the item information.

  */

 namespace ItemDB

 {

     /**

-     * Loads the item data from Items.xml

+     * Loads the item data from <code>items.xml</code>.

      */

     void load();

 

     /**

-     * Frees item data

+     * Frees item data.

      */

     void unload();

 

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 4569ced7..15a88b4d 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -30,11 +30,11 @@
 #include "resourcemanager.h"
 #include "image.h"
 
-#include "../base64.h"
 #include "../log.h"
 #include "../map.h"
 #include "../tileset.h"
 
+#include "../utils/base64.h"
 #include "../utils/tostring.h"
 #include "../utils/xml.h"
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index fb03f6c1..e4406f9c 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -34,11 +34,15 @@ namespace
 {

     MonsterDB::MonsterInfos mMonsterInfos;

     MonsterInfo mUnknown;

+    bool mLoaded = false;

 }

 

 void

 MonsterDB::load()

 {

+    if (mLoaded)

+        return;

+

     mUnknown.setSprite("error.xml");

     mUnknown.setName("unnamed");

 

@@ -123,6 +127,8 @@ MonsterDB::load()
         }

         mMonsterInfos[XML::getProperty(monsterNode, "id", 0)] = currentInfo;

     }

+

+    mLoaded = true;

 }

 

 void

@@ -131,6 +137,8 @@ MonsterDB::unload()
     for_each (  mMonsterInfos.begin(), mMonsterInfos.end(),

                 make_dtor(mMonsterInfos));

     mMonsterInfos.clear();

+

+    mLoaded = false;

 }

 

 

diff --git a/src/resources/openglsdlimageloader.cpp b/src/resources/openglsdlimageloader.cpp
index b3e1601e..68de1e19 100644
--- a/src/resources/openglsdlimageloader.cpp
+++ b/src/resources/openglsdlimageloader.cpp
@@ -31,7 +31,8 @@
 
 #ifdef USE_OPENGL
 
-SDL_Surface* OpenGLSDLImageLoader::loadSDLSurface(const std::string& filename)
+SDL_Surface*
+OpenGLSDLImageLoader::loadSDLSurface(const std::string &filename)
 {
     ResourceManager *resman = ResourceManager::getInstance();
     return resman->loadSDLSurface(filename);
diff --git a/src/resources/openglsdlimageloader.h b/src/resources/openglsdlimageloader.h
index 29be294c..b79dde15 100644
--- a/src/resources/openglsdlimageloader.h
+++ b/src/resources/openglsdlimageloader.h
@@ -31,7 +31,8 @@
 class OpenGLSDLImageLoader : public gcn::OpenGLSDLImageLoader
 {
     protected:
-        SDL_Surface* loadSDLSurface(const std::string& filename);
+        SDL_Surface*
+        loadSDLSurface(const std::string &filename);
 };
 
 #endif
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index bd273b3b..feb6f8f8 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -23,11 +23,10 @@
 
 #include "spritedef.h"
 
-#include "../animation.h"
-#include "../action.h"
-#include "../graphics.h"
 #include "../log.h"
 
+#include "animation.h"
+#include "action.h"
 #include "resourcemanager.h"
 #include "spriteset.h"
 #include "image.h"
@@ -208,20 +207,20 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
     Animation *animation = new Animation();
     action->setAnimation(directionType, animation);
 
-    // Get animation phases
-    for (xmlNodePtr phaseNode = animationNode->xmlChildrenNode;
-            phaseNode != NULL;
-            phaseNode = phaseNode->next)
+    // Get animation frames
+    for (xmlNodePtr frameNode = animationNode->xmlChildrenNode;
+            frameNode != NULL;
+            frameNode = frameNode->next)
     {
-        int delay = XML::getProperty(phaseNode, "delay", 0);
-        int offsetX = XML::getProperty(phaseNode, "offsetX", 0);
-        int offsetY = XML::getProperty(phaseNode, "offsetY", 0);
+        int delay = XML::getProperty(frameNode, "delay", 0);
+        int offsetX = XML::getProperty(frameNode, "offsetX", 0);
+        int offsetY = XML::getProperty(frameNode, "offsetY", 0);
         offsetY -= imageset->getHeight() - 32;
         offsetX -= imageset->getWidth() / 2 - 16;
 
-        if (xmlStrEqual(phaseNode->name, BAD_CAST "frame"))
+        if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
         {
-            int index = XML::getProperty(phaseNode, "index", -1);
+            int index = XML::getProperty(frameNode, "index", -1);
 
             if (index < 0)
             {
@@ -237,12 +236,12 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                 continue;
             }
 
-            animation->addPhase(img, delay, offsetX, offsetY);
+            animation->addFrame(img, delay, offsetX, offsetY);
         }
-        else if (xmlStrEqual(phaseNode->name, BAD_CAST "sequence"))
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
         {
-            int start = XML::getProperty(phaseNode, "start", -1);
-            int end = XML::getProperty(phaseNode, "end", -1);
+            int start = XML::getProperty(frameNode, "start", -1);
+            int end = XML::getProperty(frameNode, "end", -1);
 
             if (start < 0 || end < 0)
             {
@@ -261,15 +260,15 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                     continue;
                 }
 
-                animation->addPhase(img, delay, offsetX, offsetY);
+                animation->addFrame(img, delay, offsetX, offsetY);
                 start++;
             }
         }
-        else if (xmlStrEqual(phaseNode->name, BAD_CAST "end"))
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "end"))
         {
             animation->addTerminator();
         }
-    } // for phaseNode
+    } // for frameNode
 }
 
 void
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 64414259..057129ad 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -32,10 +32,7 @@
 #include <libxml/tree.h>
 
 class Action;
-class Graphics;
 class Spriteset;
-struct AnimationPhase;
-class Animation;
 
 enum SpriteAction
 {
diff --git a/src/resources/spriteset.cpp b/src/resources/spriteset.cpp
index 9b09f1e5..96bcef0c 100644
--- a/src/resources/spriteset.cpp
+++ b/src/resources/spriteset.cpp
@@ -53,7 +53,7 @@ Spriteset::~Spriteset()
 Image*
 Spriteset::get(size_type i)
 {
-    if (i > mSpriteset.size())
+    if (i >= mSpriteset.size())
     {
         logger->log("Warning: Sprite #%i does not exist in this spriteset", i);
         return NULL;