summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-09-13 18:08:22 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-09-13 18:08:22 +0200
commitd6248271842aa6edc26135568d92150f69491292 (patch)
treecc8c659fb55215f5f60d1ad56c79612004e212cd /src/map.h
parent135da0b9b7604d3348bf6955f4dae35211dd307c (diff)
parent7b68fc4ec5c2779a83ecfd214d23687132b3432a (diff)
downloadmana-client-d6248271842aa6edc26135568d92150f69491292.tar.gz
mana-client-d6248271842aa6edc26135568d92150f69491292.tar.bz2
mana-client-d6248271842aa6edc26135568d92150f69491292.tar.xz
mana-client-d6248271842aa6edc26135568d92150f69491292.zip
Merge github.com:mana/mana
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map.h b/src/map.h
index 56ddae11..19cd0e9d 100644
--- a/src/map.h
+++ b/src/map.h
@@ -162,6 +162,7 @@ class Map : public Properties
enum DebugFlags
{
+ MAP_NORMAL = 0x0,
MAP_GRID = 0x1,
MAP_COLLISION_TILES = 0x2,
MAP_BEING_COLLISION_RADIUS = 0x4,
@@ -386,7 +387,7 @@ class Map : public Properties
int mWidth, mHeight;
int mTileWidth, mTileHeight;
- int mMaxTileHeight;
+ int mMaxTileHeight, mMaxTileWidth;
MetaTile *mMetaTiles;
Layers mLayers;
Tilesets mTilesets;