Diff: My_game_clases/Functions.h

Revision:

24:74a53dd49806

Parent:

23:cd38e48635e7

Child:

25:b0c1d7955678

--- a/My_game_clases/Functions.h	Mon May 18 10:54:22 2020 +0000
+++ b/My_game_clases/Functions.h	Mon May 18 11:27:07 2020 +0000
@@ -45,22 +45,25 @@
     /** Draw parabolic ball
     * @param N5110 class object
     * @param Object class object
+    * @param Gamepad class object
     * @param chosen ball(int)
     */
-    void ball_position_parabolic( N5110 &lcd, Objects &objects, int c);//governs the balls movement in a parabolic way
+    void ball_position_parabolic( N5110 &lcd, Objects &objects,Gamepad &pad, int c);//governs the balls movement in a parabolic way
    
      /** Draw linear ball
     * @param N5110 class object
     * @param Object class object
+    * @param Gamepad class object
     * @param chosen ball(int)
     */
-    void ball_position_linear (N5110 &lcd, Objects &objects, int c);//governs the balls movement in a linear way
+    void ball_position_linear (N5110 &lcd, Objects &objects,Gamepad &pad, int c);//governs the balls movement in a linear way
     
     /** Check for collisions
     * @param N5110 class object
     * @param Object class object
+    * @param Gamepad class object
     */
-    void collision_checker(N5110 &lcd,Objects &objects);//checks if the shot has coma into contact with the ball
+    void collision_checker(N5110 &lcd,Objects &objects,Gamepad &pad);//checks if the shot has coma into contact with the ball
     
     /** Find the collided ball(linear)
     * @param x value of pixel that cause the collision
@@ -123,5 +126,6 @@
     vector <int> created_balls;//holds linear balls
     vector <int> created_ball;//holds the parabolic balls
     int _note_count; //holds the number of how many notes the note array has
+    float _bpm; //beats per minute
 };
 #endif
\ No newline at end of file