Diff: Catch_Model.cpp

Revision:

13:ae2dac4ab786

Parent:

12:f7d6003e5c6b

Child:

14:6764bb61d413

diff -r f7d6003e5c6b -r ae2dac4ab786 Catch_Model.cpp
--- a/Catch_Model.cpp	Thu Apr 20 14:26:32 2017 +0000
+++ b/Catch_Model.cpp	Sat Apr 22 12:32:41 2017 +0000
@@ -9,7 +9,7 @@
 {
     
 }
-
+//INITILISATION FUNCTIONS//
 void Catch_Model::init(int basket_y, int basket_width, int objects_speed, int lives)
 {
     _basket_y = basket_y;
@@ -38,15 +38,7 @@
     objects.move(_objects_speed);
 }
 
-void Catch_Model::draw(N5110 &lcd)
-{
-    basket.draw(lcd);
-    objects.draw(lcd);
-    print_score(lcd);
-    print_lives(lcd);
-    print_delay(lcd);
-}
-
+//GAME RULES FUNCTIONS//
 void Catch_Model::check_basket_catch(N5110 &lcd, Gamepad &pad)
 {
    int b_x_pos = basket.get_x();
@@ -84,6 +76,30 @@
       } 
 }
 
+void Catch_Model::add_score()
+{
+    int score_var;
+    score_var = objects.get_score_var();
+    
+    if (score_var == 1) {
+        basket.add_score_1();
+    } else if (score_var == 2) {
+        basket.add_score_2();
+    } else if (score_var == 3) {
+        basket.add_score_5();
+    } else if (score_var == 4) {
+        basket.add_score_10();
+    } else {
+        _lives--;
+    }
+}
+
+int Catch_Model::get_lives() 
+{
+    return _lives;
+}
+
+//BUTTON FUNCTIONS//
 void Catch_Model::check_a(N5110 &lcd, Gamepad &pad)
 {
     if (
@@ -113,44 +129,19 @@
     
 }
 
-void Catch_Model::check_x(N5110 &lcd, Gamepad &pad)
-{
-    if (
-        (pad.check_event(Gamepad::X_PRESSED) == true) &&
-        (_delay == 1)
-        ) {  
-            _delay = 0;
-            timeout.attach(this, &Catch_Model::set_delay, 10.0);  
-        }    
-                
-}
-
 void Catch_Model::set_delay()
 {
     _delay = 1;
 }
 
-void Catch_Model::add_score()
+//DISPLAY FUNCTIONS//
+void Catch_Model::draw(N5110 &lcd)
 {
-    int score_var;
-    score_var = objects.get_score_var();
-    
-    if (score_var == 1) {
-        basket.add_score_1();
-    } else if (score_var == 2) {
-        basket.add_score_2();
-    } else if (score_var == 3) {
-        basket.add_score_5();
-    } else if (score_var == 4) {
-        basket.add_score_10();
-    } else {
-        _lives--;
-    }
-}
-
-int Catch_Model::get_lives() 
-{
-    return _lives;
+    basket.draw(lcd);
+    objects.draw(lcd);
+    print_score(lcd);
+    print_lives(lcd);
+    print_delay(lcd);
 }
 
 void Catch_Model::print_lives(N5110 &lcd)
@@ -196,5 +187,5 @@
         } else {
             lcd.drawLine(46,0,54,8,1);
             lcd.drawLine(46,8,54,0,1);
-            }
+        }
 }
\ No newline at end of file