summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-15 13:10:38 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-15 13:10:38 -0600
commite8a1b2386bb2c28cfce0eb28d7e7067d51bb6701 (patch)
tree6c9218f32675f9d401301172869c30488ab08b16 /src/map.h
parent56c224050f10d976298cef98607aa3b3e56fcc99 (diff)
parent3d85a00ff2a33e22ba63d0b7dfc156d8076933e1 (diff)
downloadmana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.gz
mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.bz2
mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.tar.xz
mana-e8a1b2386bb2c28cfce0eb28d7e7067d51bb6701.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map.h b/src/map.h
index 09bed293..c49ebb12 100644
--- a/src/map.h
+++ b/src/map.h
@@ -73,7 +73,7 @@ class TileAnimation
public:
TileAnimation(Animation *ani);
~TileAnimation();
- void update();
+ void update(int ticks = 1);
void addAffectedTile(MapLayer *layer, int index)
{ mAffected.push_back(std::make_pair(layer, index)); }
private:
@@ -169,9 +169,9 @@ class Map : public Properties
void initializeOverlays();
/**
- * Updates animations. Called every game tick.
+ * Updates animations. Called as needed.
*/
- void update();
+ void update(int ticks = 1);
/**
* Draws the map to the given graphics output. This method draws all