diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 11:27:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 12:34:23 +0300 |
| commit | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (patch) | |
| tree | ba2d006e8aaac74138eb13ba458d30abf8f01182 /src/actorspritemanager.cpp | |
| parent | 9569f124d176b4220f28f9a41812c33883737228 (diff) | |
| download | mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2 mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip | |
some more style fixes from cpplint.
Diffstat (limited to 'src/actorspritemanager.cpp')
| -rw-r--r-- | src/actorspritemanager.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 09dc1ff8e..6de1e0396 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -358,7 +358,6 @@ Being *ActorSpriteManager::findBeingByPixel(const int x, const int y, || (targetDead && being->getType() == Being::PLAYER)) && (allPlayers || being != player_node)) { - if ((being->getPixelX() - 16 <= x) && (being->getPixelX() + 16 > x) && (being->getPixelY() - 32 <= y) && @@ -446,7 +445,6 @@ void ActorSpriteManager::findBeingsByPixel(std::vector<ActorSprite*> &beings, && (allPlayers || being != player_node)) || actor->getType() == ActorSprite::FLOOR_ITEM) { - if ((actor->getPixelX() - xtol <= x) && (actor->getPixelX() + xtol > x) && (actor->getPixelY() - uptol <= y) && @@ -1030,8 +1028,6 @@ Being *ActorSpriteManager::findNearestLivingBeing(const Being *const const bool valid = validateBeing(aroundBeing, being, type, excluded, 50); int d = being->getDistance(); -// logger->log("dist: %d", dist); -// logger->log("name: %s, %d, %d", being->getName().c_str(), (int)valid, d); if (being->getType() != Being::MONSTER || !mTargetOnlyReachable) { // if distance not calculated, use old distance d = (being->getTileX() - x) * (being->getTileX() - x) |