diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-08-24 18:29:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-08-24 18:30:16 +0300 |
| commit | a316d537dce50f4b4e1e10f5c26a7851baddbd8b (patch) | |
| tree | 078de355216db6dab67df9575402cdba7d537dbd /src/actorspritemanager.cpp | |
| parent | cb00b6fe126afe5fff8fc7ff491fda6003ea68f2 (diff) | |
| download | manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.tar.gz manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.tar.bz2 manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.tar.xz manaplus-a316d537dce50f4b4e1e10f5c26a7851baddbd8b.zip | |
Small style changes.
Also fix overloaded methods visibility.
Diffstat (limited to 'src/actorspritemanager.cpp')
| -rw-r--r-- | src/actorspritemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index 095ce745c..012cdd3e0 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -335,7 +335,7 @@ Being *ActorSpriteManager::findBeingByPixel(int x, int y, if (!noBeing) { FloorItem *floor = static_cast<FloorItem*>(*it); - if (!noBeing && (floor->getPixelX() - 32 <= x) && + if ((floor->getPixelX() - 32 <= x) && (floor->getPixelX() + 32 > x) && (floor->getPixelY() - 64 <= y) && (floor->getPixelY() + 16 > y)) @@ -1243,7 +1243,7 @@ void ActorSpriteManager::deleteBlock(uint32_t id) { if (*iter == id) { - iter = blockedBeings.erase(iter); + blockedBeings.erase(iter); break; } } |