diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-24 00:13:24 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-24 00:13:24 +0000 |
| commit | 4789ebb11407eb9402c385f3cc6fa242d91214c2 (patch) | |
| tree | 6bf5bed52073ae19ef4b5b08e7fe92af603f04d8 /src/tileset.h | |
| parent | 1b7ff9ad4160fd0ff79d2da658eca8d8c8abf815 (diff) | |
| download | mana-4789ebb11407eb9402c385f3cc6fa242d91214c2.tar.gz mana-4789ebb11407eb9402c385f3cc6fa242d91214c2.tar.bz2 mana-4789ebb11407eb9402c385f3cc6fa242d91214c2.tar.xz mana-4789ebb11407eb9402c385f3cc6fa242d91214c2.zip | |
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.
Diffstat (limited to 'src/tileset.h')
| -rw-r--r-- | src/tileset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tileset.h b/src/tileset.h index 5fa4ade1..27bc28c3 100644 --- a/src/tileset.h +++ b/src/tileset.h @@ -24,7 +24,7 @@ #ifndef _TMW_TILESET_H_ #define _TMW_TILESET_H_ -#include "graphic/spriteset.h" +#include "resources/spriteset.h" /** * A tileset, which is basically just a spriteset but it stores a firstgid. @@ -36,7 +36,7 @@ class Tileset : public Spriteset * Constructor. */ Tileset(Image *img, int w, int h, int firstGid): - Spriteset(img, w, h), + Spriteset("", img, w, h), mFirstGid(firstGid) { } |