Nathan Johnston / Catch_Model

Uses accompanying Basket, Objects and Fruit libraries to create Fruit Basket game. If an object is caught, points are added; if an object in missed, a 'life' is lost.

Dependents:   Game_Controller_Project

Diff: Catch_Model.cpp

Revision:
6:61bcf98e0a88
Parent:
5:7db3e43e5aca
Child:
7:ec6dc66ee196
diff -r 7db3e43e5aca -r 61bcf98e0a88 Catch_Model.cpp
--- a/Catch_Model.cpp	Fri Mar 31 13:44:48 2017 +0000
+++ b/Catch_Model.cpp	Tue Apr 04 16:33:19 2017 +0000
@@ -69,10 +69,15 @@
    int o_x_pos = objects.get_x();
    int o_y_pos = objects.get_y();
    
+   int score_var;
+   score_var = objects.get_score_var();
+   
    if (o_y_pos > b_y_pos) {
        objects.undraw(lcd);
+       if (score_var != 5) {
+           _lives--;
+        }
        objects.init(_objects_speed);
-       _lives--;
    } 
 }
 
@@ -87,8 +92,10 @@
         basket.add_score_2();
     } else if (score_var == 3) {
         basket.add_score_5();
+    } else if (score_var == 4) {
+        basket.add_score_10();
     } else {
-        basket.add_score_10();
+        _lives--;
     }
 }