diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-08-22 00:17:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-08-22 00:46:00 +0300 |
commit | e26c01fe66bc698555fdee9d681b3abd6822848a (patch) | |
tree | e74773ce1c66a714ee933d8228d94d205a37aa43 /src/actormanager.cpp | |
parent | d181a2fb30ac73173fba851d4b2f7ca6f7d46ca0 (diff) | |
download | manaplus-e26c01fe66bc698555fdee9d681b3abd6822848a.tar.gz manaplus-e26c01fe66bc698555fdee9d681b3abd6822848a.tar.bz2 manaplus-e26c01fe66bc698555fdee9d681b3abd6822848a.tar.xz manaplus-e26c01fe66bc698555fdee9d681b3abd6822848a.zip |
Remove some parentheses.
Diffstat (limited to 'src/actormanager.cpp')
-rw-r--r-- | src/actormanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp index 2649cb230..fd24147e9 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -95,11 +95,11 @@ class FindBeingFunctor final const Vector &pos = b->getPixelPositionF(); // +++ probably here need use int positions and not float? // but for now correct int positions only in Being - return (CAST_U32(pos.x) / mapTileSize == x && + return CAST_U32(pos.x) / mapTileSize == x && (CAST_U32(pos.y) / mapTileSize == y || CAST_U32(pos.y) / mapTileSize == other_y) && b->isAlive() && (type == ActorType::Unknown - || b->getType() == type)); + || b->getType() == type); } uint16_t x, y; @@ -189,7 +189,7 @@ class SortBeingFunctor final return w1 < w2; } - return (being1->getName() < being2->getName()); + return being1->getName() < being2->getName(); } StringIntMap *attackBeings; StringIntMap *priorityBeings; |