diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-11 14:22:50 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-11 14:22:50 +0300 |
commit | 47ac70cdddac59f6fcaf339295801191aef5b50b (patch) | |
tree | 7a89975482b2a83a518da1ffa6b4d71e7f3fa1cb /src/resources/map/map.h | |
parent | dcac10d557a1e6e0b5854a1400d02fe106d5c027 (diff) | |
download | manaverse-47ac70cdddac59f6fcaf339295801191aef5b50b.tar.gz manaverse-47ac70cdddac59f6fcaf339295801191aef5b50b.tar.bz2 manaverse-47ac70cdddac59f6fcaf339295801191aef5b50b.tar.xz manaverse-47ac70cdddac59f6fcaf339295801191aef5b50b.zip |
Move tileanimation into separate file.
Diffstat (limited to 'src/resources/map/map.h')
-rw-r--r-- | src/resources/map/map.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 1c1c41b5c..8c7939149 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -49,15 +49,13 @@ class Resource; class SimpleAnimation; class SpecialLayer; class Tileset; +class TileAnimation; class WalkLayer; typedef std::vector<Tileset*> Tilesets; typedef std::vector<MapLayer*> Layers; typedef Layers::const_iterator LayersCIter; -typedef std::vector<std::pair<MapLayer*, int> > TilePairVector; -typedef TilePairVector::const_iterator TilePairVectorCIter; - typedef std::vector<AmbientLayer*> AmbientLayerVector; typedef AmbientLayerVector::const_iterator AmbientLayerVectorCIter; typedef AmbientLayerVector::iterator AmbientLayerVectorIter; @@ -65,32 +63,6 @@ typedef AmbientLayerVector::iterator AmbientLayerVectorIter; static const int mapTileSize = 32; /** - * Animation cycle of a tile image which changes the map accordingly. - */ -class TileAnimation final -{ - public: - explicit TileAnimation(Animation *const ani); - - ~TileAnimation(); - - A_DELETE_COPY(TileAnimation) - - bool update(const int ticks = 1); - - void addAffectedTile(MapLayer *const layer, const int index) - { mAffected.push_back(std::make_pair(layer, index)); } - - private: - TilePairVector mAffected; - SimpleAnimation *mAnimation; - Image *mLastImage; -}; - -typedef std::map<int, TileAnimation*> TileAnimationMap; -typedef TileAnimationMap::const_iterator TileAnimationMapCIter; - -/** * A tile map. */ class Map final : public Properties, public ConfigListener |