Diff: My_game_clases/Objects.cpp

Revision:

11:4722bf70b2be

Parent:

10:f5b920a6a71a

Child:

13:1dbef50789ed

--- a/My_game_clases/Objects.cpp	Sat Apr 18 11:50:00 2020 +0000
+++ b/My_game_clases/Objects.cpp	Mon Apr 20 07:57:09 2020 +0000
@@ -33,13 +33,13 @@
     float joy_mag = pad.get_mag();
     float joy_angle = pad.get_angle();
     // checks the joystics position and determines the speed of cannon movement
-    if(joy_mag < 0.5 && _cannon_pos > 1 && joy_angle > 180.0) {
+    if(joy_mag < 0.5f && _cannon_pos > 1 && joy_angle > 180.0f) {
         _cannon_pos += -1;
-    } else if(joy_mag < 1.01 && _cannon_pos > 0 && joy_angle > 180.0) {
+    } else if(joy_mag < 1.01f && _cannon_pos > 0 && joy_angle > 180.0f) {
         _cannon_pos += -2;
-    } else if(joy_mag < 0.5 && _cannon_pos < 78 && joy_angle > 0.0) {
+    } else if(joy_mag < 0.5f && _cannon_pos < 78 && joy_angle > 0.0f) {
         _cannon_pos += 1;
-    } else if (joy_mag <= 1.01 && _cannon_pos < 77 && joy_angle > 0.0) {
+    } else if (joy_mag <= 1.01f && _cannon_pos < 77 && joy_angle > 0.0f) {
         _cannon_pos += 2;
     } else {
         _cannon_pos = _cannon_pos;
@@ -56,10 +56,10 @@
 
     for (int i = 0; i < _shot_y_pos.size(); i++) {
         lcd.drawRect(_shot_x_pos[i],_shot_y_pos[i],2,2,FILL_BLACK);
-       // printf( " %d || %d \n",_shot_x_pos.size(),_shot_y_pos.size());
+        // printf( " %d || %d \n",_shot_x_pos.size(),_shot_y_pos.size());
         _shot_y_pos[i] -= _shot_incrementer; // moves the shots upwards
     }
-    
+
     //adds another shot if the distance between
     //y pos of the initial pos and previous shot pos is more than 7
     if(_shot_y_pos[_shot_y_pos.size() - 1 ] + 7 < _initial_shot_pos || _shot_y_pos.size() < 1) {
@@ -71,29 +71,34 @@
         _shot_y_pos.erase(_shot_y_pos.begin());
         _shot_x_pos.erase(_shot_x_pos.begin());
     }
-   
+
 }
 void Objects::draw_ball(N5110 &lcd,int ball_x, int ball_y, int delta_r)
-{   
+{
     lcd.drawCircle(ball_x,ball_y,_radiuss + delta_r,FILL_BLACK);
     //lcd.setPixel( ball_x,  ball_y,0);
 }
 
-int Objects::get_size(){
- return _shot_y_pos.size();
+int Objects::get_size()
+{
+    return _shot_y_pos.size();
 };
 
-int Objects::get_x_value(int i){
+int Objects::get_x_value(int i)
+{
     return _shot_x_pos[i];
 }
 
-int Objects::get_y_value(int i){
+int Objects::get_y_value(int i)
+{
     return _shot_y_pos[i];
 }
-void Objects::erase_shot(int i){
-     _shot_y_pos.erase(_shot_y_pos.begin() + i);
-     _shot_x_pos.erase(_shot_x_pos.begin() + i);
+void Objects::erase_shot(int i)
+{
+    _shot_y_pos.erase(_shot_y_pos.begin() + i);
+    _shot_x_pos.erase(_shot_x_pos.begin() + i);
 }
-int Objects::get_x_cannon(){
+int Objects::get_x_cannon()
+{
     return _cannon_pos;
 }
\ No newline at end of file