diff options
| -rw-r--r-- | src/map.cpp | 5 | ||||
| -rw-r--r-- | src/map.h | 5 | ||||
| -rw-r--r-- | src/net/manaserv/beinghandler.cpp | 26 |
3 files changed, 0 insertions, 36 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]; @@ -333,11 +333,6 @@ class Map : public Properties */ TileAnimation *getAnimationForGid(int gid) const; - /** - * Tells whether the given pixel falls within the map boundaries. - */ - bool containsPixel(int x, int y) const; - protected: friend class Actor; diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp index fb3a3644..b319fa37 100644 --- a/src/net/manaserv/beinghandler.cpp +++ b/src/net/manaserv/beinghandler.cpp @@ -119,14 +119,6 @@ void BeingHandler::handleBeingEnterMessage(Net::MessageIn &msg) BeingDirection direction = (BeingDirection)msg.readInt8(); Being *being; - if (!Game::instance()->getCurrentMap()->containsPixel(px, py)) - { - logger->log("Warning: Received GPMSG_BEING_ENTER for being id %i " - "with position outside the map boundaries " - "(x = %i, y = %i)", id, px, py); - return; - } - switch (type) { case OBJECT_CHARACTER: @@ -230,14 +222,6 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg) // the being position if (flags & MOVING_POSITION) { - if (!being->getMap()->containsPixel(sx, sy)) - { - logger->log("Warning: Received GPMSG_BEINGS_MOVE for being id " - "%i with position outside the map boundaries " - "(x = %i, y = %i)", id, sx, sy); - continue; - } - Vector serverPos(sx, sy); if (serverPos.length() - being->getPosition().length() > POSITION_DIFF_TOLERANCE) @@ -245,17 +229,7 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg) } if (flags & MOVING_DESTINATION) - { - if (!being->getMap()->containsPixel(dx, dy)) - { - logger->log("Warning: Received GPMSG_BEINGS_MOVE for being id " - "%i with destination outside the map boundaries " - "(x = %i, y = %i)", id, dx, dy); - continue; - } - being->setDestination(dx, dy); - } } } |