Diff: Ship/Ship.cpp

Revision:

12:47578eb9ea73

Parent:

11:73cd744ffa80

Child:

13:e114d362186d

--- a/Ship/Ship.cpp	Tue Apr 09 11:21:18 2019 +0000
+++ b/Ship/Ship.cpp	Wed Apr 10 11:01:19 2019 +0000
@@ -58,7 +58,6 @@
 void Ship::update_ship(float x_joystick,float y_joystick)
 {   // Only change position if joystick is reasonably moved
     if(-0.25 > x_joystick || x_joystick > 0.25 || -0.25 > y_joystick || y_joystick > 0.25) {
-
         // Update positions using joystick and the intended ships speed
         _ship_xpos = _ship_xpos + (x_joystick*_ship_speed);
         _ship_ypos = _ship_ypos - (y_joystick*_ship_speed);
@@ -76,7 +75,6 @@
         if(_ship_ypos > (48 - (_ship_height))) {
             _ship_ypos = 48 - _ship_height;
         }
-
     }
     // printf("y_joysticzk = %f\n",y_joystick);
     // printf("x_joystick = %f\n",x_joystick);
@@ -88,7 +86,7 @@
     return ship_pos;
 }
 
-void Ship::set_ship(int ship_width, int ship height, int ship_xpos, int ship_ypos)
+void Ship::set_ship(int ship_width, int ship_height, int ship_xpos, int ship_ypos)
 {
     _ship_width = ship_width;
     _ship_height = ship_height;