Diff: Catch_Model.cpp

Revision:

10:6605cd9d374b

Parent:

9:902b67101cdc

Child:

11:68e7c942f67b

--- a/Catch_Model.cpp	Sat Apr 15 15:06:54 2017 +0000
+++ b/Catch_Model.cpp	Tue Apr 18 14:28:15 2017 +0000
@@ -17,7 +17,6 @@
     _objects_speed = objects_speed;
     _lives = lives;
     _delay = 1;
-    _bullet_time = 0;
     
     basket.init(_basket_y, _basket_width);
     objects.init(_objects_speed);
@@ -34,12 +33,10 @@
     check_basket_catch(lcd, pad);
     check_basket_miss(lcd, pad);
     
-    basket.move(_d, _mag, pad);
-    if (_bullet_time == 1) {
-        objects.bullet_time();
-    } else {
-        objects.move(pad);
-    }
+    basket.move_stick(_d, _mag);
+    basket.move_LR(pad);
+    objects.speed_select(pad);
+    objects.move();
 }
 
 void Catch_Model::draw(N5110 &lcd)
@@ -122,17 +119,7 @@
     if (
         (pad.check_event(Gamepad::X_PRESSED) == true) &&
         (_delay == 1)
-        ) { 
-            /*
-            int b_y_pos = basket.get_y();
-            int o_y_pos = objects.get_y();
-            
-            do {
-                _bullet_time = 1;
-                } while (o_y_pos < b_y_pos);
-                
-            _bullet_time = 0; 
-            */
+        ) {  
             _delay = 0;
             timeout.attach(this, &Catch_Model::set_delay, 10.0);  
         }