summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-03 19:47:38 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-05 16:11:23 +0100
commitcd8c1a4d5c63336b6d6ee212ad6cfdc52bad01c7 (patch)
treef0683498a43378e54e8b96203718d1d6c698e38e /src/map.cpp
parent1d6723caf7def24c567b5fca260bd55ae6423952 (diff)
downloadmana-client-cd8c1a4d5c63336b6d6ee212ad6cfdc52bad01c7.tar.gz
mana-client-cd8c1a4d5c63336b6d6ee212ad6cfdc52bad01c7.tar.bz2
mana-client-cd8c1a4d5c63336b6d6ee212ad6cfdc52bad01c7.tar.xz
mana-client-cd8c1a4d5c63336b6d6ee212ad6cfdc52bad01c7.zip
Revert "Checking being positions send by the server"
This reverts commit 92fd074aa85e2357bfe1ab642209dd5a0d87e4d5. Reverting because these checks should be done server-side and because having them in the client would currently require wrapping them up in checks if there is even a current map due to the reliance on tile size (we need to handle the case where the current map didn't load properly without crashing). Conflicts: src/map.cpp src/net/manaserv/beinghandler.cpp Reviewed-by: Erik Schilling
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/map.cpp b/src/map.cpp
index b91c15ec..89bcf061 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -628,11 +628,6 @@ bool Map::contains(int x, int y) const
return x >= 0 && y >= 0 && x < mWidth && y < mHeight;
}
-bool Map::containsPixel(int x, int y) const
-{
- return contains(x / mTileWidth, y / mTileHeight);
-}
-
MetaTile *Map::getMetaTile(int x, int y) const
{
return &mMetaTiles[x + y * mWidth];