ELEC2645 (2018/19) / Mbed 2 deprecated el17aio

Dependencies:   mbed

Revision:
6:8473dacbeb65
Parent:
5:bb6edc5b5be3
Child:
9:241a1a7d8527
--- a/Ship/Ship.h	Tue Mar 05 07:08:57 2019 +0000
+++ b/Ship/Ship.h	Tue Mar 05 09:57:55 2019 +0000
@@ -12,12 +12,11 @@
 public:
     Ship();
     ~Ship();
-
-    // enter default position and size of ship that will change depending on ship
-    void init(int ship_speed,int ship_width,int ship_height,int _ship_xpos,int _ship_ypos,const int ship_shape);
+    // enter default position,size of ship and its shape that will change depending on ship
+    void init(int ship_speed,int ship_width,int ship_height,int _ship_xpos,int _ship_ypos);
     void draw_ship(N5110 &lcd);
     // Updates the ships position when its x and y position are entered
-    void update_ship();
+    void update_ship(int x_joystick,int y_joystick);
     // Gets the ships current position
     Vector2D get_pos();
     
@@ -27,7 +26,7 @@
     int _ship_height;
     int _ship_xpos;
     int _ship_ypos;
-    const int ship_shape;
+//    const int _ship_shape;
 
 };