Add parentheses to make the operator precedence explicit.

przemek83 · Sep 13, 2024 · 6c38ed9 · 6c38ed9
1 parent eca45de
commit 6c38ed9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/Bullet.cpp b/src/Bullet.cpp
@@ -7,8 +7,9 @@
 
 Bullet::Bullet(Point startingPoint, unsigned int speed, bool playerOrigin,
                unsigned int power, Direction direction)
-    : Drawable({startingPoint.x_ - Config::getInstance().getBulletSize() / 2,
-                startingPoint.y_ - Config::getInstance().getBulletSize() / 2}),
+    : Drawable(
+          {startingPoint.x_ - (Config::getInstance().getBulletSize() / 2),
+           startingPoint.y_ - (Config::getInstance().getBulletSize() / 2)}),
       size_(Config::getInstance().getBulletSize()),
       playerOrigin_(playerOrigin),
       direction_(direction),

diff --git a/src/Config.cpp b/src/Config.cpp
@@ -51,7 +51,7 @@ void Config::setFPS(FPS fps)
 Config::Config()
 {
     const unsigned int initialBoardSize{tileCount_ * tileSize_};
-    screenSizeChanged(initialBoardSize + initialBoardSize / 3,
+    screenSizeChanged(initialBoardSize + (initialBoardSize / 3),
                       initialBoardSize);
 }
 
@@ -61,5 +61,5 @@ float Config::calculateSpeedFactor() const
                                defaultTileSize_};
     const float fpsFactor{static_cast<float>(getFps()) /
                           static_cast<float>(defaultFps_)};
-    return 1.F * tileSizeFactor / fpsFactor;
+    return tileSizeFactor / fpsFactor;
 }
diff --git a/src/Game.cpp b/src/Game.cpp
@@ -141,9 +141,9 @@ void Game::control(Map& map, std::list<Tank>& tanks, std::list<Bullet>& bullets)
             if (tank.canFire(now))
                 bullets.emplace_back(tank.fire(now));
             const int randomDirection{distribution_(randomGenerator_)};
-            if ((tank.getX() % Config::getInstance().getTileSize() == 0) &&
-                (tank.getY() % Config::getInstance().getTileSize() == 0) &&
-                randomDirection < 4)
+            if (((tank.getX() % Config::getInstance().getTileSize()) == 0) &&
+                ((tank.getY() % Config::getInstance().getTileSize()) == 0) &&
+                (randomDirection < 4))
                 direction = static_cast<Direction>(randomDirection);
             else
                 direction = tank.getDirection();

diff --git a/src/Map.cpp b/src/Map.cpp
@@ -153,10 +153,10 @@ void Map::shift(Point& pointToShift, Direction direction) const
 {
     const unsigned int tileSize{Config::getInstance().getTileSize()};
     const Point leftUpper{pointToShift};
-    const Point leftLower{leftUpper.x_, leftUpper.y_ + tileSize - 1};
-    const Point rightUpper{leftUpper.x_ + tileSize - 1, leftUpper.y_};
-    const Point rightLower{leftUpper.x_ + tileSize - 1,
-                           leftUpper.y_ + tileSize - 1};
+    const Point leftLower{leftUpper.x_, (leftUpper.y_ + tileSize) - 1};
+    const Point rightUpper{(leftUpper.x_ + tileSize) - 1, leftUpper.y_};
+    const Point rightLower{(leftUpper.x_ + tileSize) - 1,
+                           (leftUpper.y_ + tileSize) - 1};
     switch (direction)
     {
         case Direction::UP:
@@ -217,7 +217,7 @@ Point Map::tileToScreenPoint(Point point)
 
 void Map::shiftRight(Point& point, unsigned int tileSize)
 {
-    point.x_ = (point.x_ / tileSize + 1) * tileSize;
+    point.x_ = ((point.x_ / tileSize) + 1) * tileSize;
 }
 
 void Map::shiftLeft(Point& point, unsigned int tileSize)