summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2011-11-17 20:22:17 -0600
committerDavid Athay <ko2fan@gmail.com>2011-11-17 20:22:17 -0600
commit41a8c0406301fdb3d92374774066837c42eed112 (patch)
treeb0e2ef0862d38057ec3ed045500ca463b120109d /src/map.h
parentcd0caeb87a10bc8ed645223c7155c9576b6fb102 (diff)
parent965cad21750b45206ceea4523d94b7ec92bb8ac6 (diff)
downloadmana-client-41a8c0406301fdb3d92374774066837c42eed112.tar.gz
mana-client-41a8c0406301fdb3d92374774066837c42eed112.tar.bz2
mana-client-41a8c0406301fdb3d92374774066837c42eed112.tar.xz
mana-client-41a8c0406301fdb3d92374774066837c42eed112.zip
Merge branch '0.5' of github.com:mana/mana into 0.50.5
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map.h b/src/map.h
index 9fc32232..2e0eb614 100644
--- a/src/map.h
+++ b/src/map.h
@@ -360,7 +360,7 @@ class Map : public Properties
int mWidth, mHeight;
int mTileWidth, mTileHeight;
- int mMaxTileHeight;
+ int mMaxTileHeight, mMaxTileWidth;
MetaTile *mMetaTiles;
Layers mLayers;
Tilesets mTilesets;