Collisions Moved to Ball Object

Classes.h

@@ -1,6 +1,10 @@
 #include <SFML/Graphics.hpp>
 #include <SFML/Audio.hpp>
 
+const int gameWidth = 800;
+const int gameHeight = 600;
+
+
 class Paddle : public sf::RectangleShape {
     private:
     float x,
@@ -39,5 +43,6 @@ class Ball : public sf::CircleShape {
         void render(sf::RenderWindow) const;
         void checkLeftPaddle(Paddle leftPaddle, sf::Sound ballSound);
         void checkRightPaddle(Paddle rightPaddle, sf::Sound ballSound);
+        void checkCollisions(sf::Sound ballsound);
 
 };

functions.cpp

@@ -88,6 +88,21 @@ void Ball::checkRightPaddle(Paddle rightPaddle, sf::Sound ballSound) {
     }
 }
 
+void Ball::checkCollisions(sf::Sound ballSound) {
+    if (getY() - radius < 0.f)
+            {
+                ballSound.play();
+                angle = -angle;
+                setPosition(getX(), radius + 0.1);
+            }
+            if (getY() + radius > gameHeight)
+            {
+                ballSound.play();
+                angle = -angle;
+                setPosition(getX(), gameHeight - radius - 0.1);
+            }
+}
+
 Paddle::Paddle() {
     size.x = 25;
     size.y = 100;

pong.cpp

@@ -30,14 +30,14 @@ string resourcesDir()
 /// \return Application exit code
 ///
 ////////////////////////////////////////////////////////////
+
 int main()
 {
     srand(static_cast<unsigned int>(time(NULL)));
 
     // Define some constants
     const float pi = 3.1415;
-    const int gameWidth = 800;
-    const int gameHeight = 600;
+
 
     // Create the window of the application
     sf::RenderWindow window(sf::VideoMode(gameWidth, gameHeight, 32), "SFML Pong",
@@ -197,18 +197,9 @@ int main()
                 isPlaying = false;
                 pauseMessage.setString("You Won!\n" + inputString);
             }
-            if (ball.getY() - ball.getRadius() < 0.f)
-            {
-                ballSound.play();
-                ball.setAngle(-ball.getAngle());
-                ball.setPosition(ball.getX(), ball.getRadius() + 0.1f);
-            }
-            if (ball.getY() + ball.getRadius() > gameHeight)
-            {
-                ballSound.play();
-                ball.setAngle(-ball.getAngle());
-                ball.setPosition(ball.getX(), gameHeight - ball.getRadius() - 0.1f);
-            }
+
+            
+            ball.checkCollisions(ballSound);
 
             // Check the collisions between the ball and the paddles
             // Left Paddle