ELEC2645 (2018/19) / Mbed 2 deprecated el17szs

Dependencies:   mbed

Revision:
6:3e50f2cf4366
Parent:
4:55a0509c4874
Child:
7:a1a6bff238c1
--- a/Ball/Ball.h	Tue Apr 16 10:17:21 2019 +0000
+++ b/Ball/Ball.h	Thu Apr 18 09:31:52 2019 +0000
@@ -4,7 +4,7 @@
 #include "mbed.h"
 #include "N5110.h"
 #include "Gamepad.h"
-
+#include "Bat.h"
 /** Ball Class
 @author Dr Craig A. Evans, University of Leeds
 @brief Controls the ball in the Pong game 
@@ -24,7 +24,7 @@
     Vector2D get_velocity();
     Vector2D get_pos();
     void set_pos(Vector2D p);
-    void start(N5110 &lcd);
+    void start(N5110 &lcd,int checkHit);
     void get_direction(Gamepad &pad);
     void set_field(N5110 &lcd);
     
@@ -35,10 +35,12 @@
         int y;
         int position;
     };
-
+    Bat bat;
+    int ballHit;
     Vector2D _velocity;
     Fielder field[5];
     Direction _d;
+    int bowled;
     int d;
     int _size;
     int _x;