Implemented caching of spritesets, including a lot of cleanups to the new

animation system. Action now refers to the Spriteset directly and
AnimatedSprite refers to the current Action directly instead of using the
std::map with a std::string constantly. Some methods and parameters are marked
as const. The READ_PROP macro was replaced by static methods. Warnings are
logged when unnamed actions are defined or when actions refer to undefined
imagesets. Code is more tolerant towards missing actions.

2 files changed, 0 insertions, 126 deletions

diff --git a/src/graphic/spriteset.cpp b/src/graphic/spriteset.cpp
deleted file mode 100644
index 3b190f31..00000000
--- a/src/graphic/spriteset.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  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 "spriteset.h"
-
-#include "../log.h"
-
-#include "../resources/image.h"
-
-#include "../utils/dtor.h"
-
-Spriteset::Spriteset(Image *img, int width, int height)
-{
-    for (int y = 0; y + height <= img->getHeight(); y += height)
-    {
-        for (int x = 0; x + width <= img->getWidth(); x += width)
-        {
-            mSpriteset.push_back(img->getSubImage(x, y, width, height));
-        }
-    }
-    mWidth = width;
-    mHeight = height;
-}
-
-Spriteset::~Spriteset()
-{
-    for_each(mSpriteset.begin(), mSpriteset.end(), make_dtor(mSpriteset));
-}
-
-Image *
-Spriteset::get(size_type i)
-{
-    if (i > mSpriteset.size())
-    {
-        logger->log("Warning: Sprite #%i does not exist in this spriteset", i);
-        return NULL;
-    }
-    else
-    {
-        return mSpriteset[i];
-    }
-}
diff --git a/src/graphic/spriteset.h b/src/graphic/spriteset.h
deleted file mode 100644
index 94ccb742..00000000
--- a/src/graphic/spriteset.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  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_SPRITESET_H
-#define _TMW_SPRITESET_H
-
-#include <vector>
-
-class Image;
-
-
-/**
- * Stores a complete set of sprites.
- */
-class Spriteset {
-    public:
-        /*
-         * Cuts the passed image in a grid of sub images.
-         */
-        Spriteset(Image *img, int w, int h);
-
-        /**
-         * Destructor.
-         */
-        ~Spriteset();
-
-        int getWidth() { return mWidth; };
-
-        int getHeight() { return mHeight; };
-
-        typedef std::vector<Image*>::size_type size_type;
-        Image * get(size_type i);
-
-        size_type size() { return mSpriteset.size(); }
-
-    private:
-        // Vector storing the whole spriteset.
-        std::vector<Image*> mSpriteset;
-        //height and width of the images in the spriteset
-        int mHeight;
-        int mWidth;
-};
-
-#endif