summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2010-02-09 03:18:35 +0100
committerBertram <bertram@cegetel.net>2010-02-09 03:20:48 +0100
commitb7f93f0b2ec91e04d3ed9035c9e21015b8b57cdd (patch)
tree2d110cf418fab5d733c5172a52aaaffa74c2d693 /src/map.h
parent6a6b36fa2d19a6ea9d39b975354709e7ad82281d (diff)
downloadmana-b7f93f0b2ec91e04d3ed9035c9e21015b8b57cdd.tar.gz
mana-b7f93f0b2ec91e04d3ed9035c9e21015b8b57cdd.tar.bz2
mana-b7f93f0b2ec91e04d3ed9035c9e21015b8b57cdd.tar.xz
mana-b7f93f0b2ec91e04d3ed9035c9e21015b8b57cdd.zip
Got successfully rid of tile width/height fallback values as asked by Jaxad.
But I added some logs when speed and other actions where refused due to game/map uninitialized. This could help.
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map.h b/src/map.h
index d33f31db..3cf2ff59 100644
--- a/src/map.h
+++ b/src/map.h
@@ -43,10 +43,6 @@ typedef std::list<Sprite*> MapSprites;
typedef MapSprites::iterator MapSprite;
typedef std::vector<MapLayer*> Layers;
-/** Default fallback values for tiles width and height */
-extern const int DEFAULT_TILE_WIDTH; /**< Used for X coords */
-extern const int DEFAULT_TILE_HEIGHT; /**< Used for Y coords */
-
/**
* A meta tile stores additional information about a location on a tile map.
* This is information that doesn't need to be repeated for each tile in each
@@ -259,13 +255,13 @@ class Map : public Properties
* Returns the tile width of this map.
*/
int getTileWidth() const
- { return mTileWidth > 0 ? mTileWidth : DEFAULT_TILE_WIDTH; }
+ { return mTileWidth; }
/**
* Returns the tile height used by this map.
*/
int getTileHeight() const
- { return mTileHeight > 0 ? mTileHeight : DEFAULT_TILE_HEIGHT; }
+ { return mTileHeight; }
const std::string &getMusicFile() const;
const std::string &getName() const;