Diff: BreakoutEngine/BreakoutEngine.cpp

Revision:

64:c3426b417ad9

Parent:

63:2de6fb2de428

Child:

65:ec89c0b74a71

--- a/BreakoutEngine/BreakoutEngine.cpp	Sat May 04 20:40:32 2019 +0000
+++ b/BreakoutEngine/BreakoutEngine.cpp	Sun May 05 15:17:38 2019 +0000
@@ -12,7 +12,7 @@
 
 }
 
-void BreakoutEngine::init(int paddle_width,int paddle_height,int ball_size,int speed, int prev_score)
+void BreakoutEngine::init(int paddle_width,int paddle_height,int ball_size,int speed)
 {
     /*
     printf("init started /n");
@@ -28,7 +28,8 @@
     _number_left = 18;
     _index = 0;
     _cool_time = 0.0f;
-    _prev_score = prev_score;
+    _score = 0;
+    _prev_score = 0;
     _multiplier = 1;
     
     // y position on screen - WIDTH is defined in N5110.h
@@ -433,19 +434,24 @@
 void BreakoutEngine::print_scores(N5110 &lcd) //maybe add to oneless
 {
     // get scores from paddles
-    int p1_score = 1800*(_multiplier-1) + (18 - get_num_left())*100 * _multiplier;     //maybe add a previous score so the score carries over through victory screens. add hi score fix so restart restarts from 321
+    int score = _prev_score + (18 - get_num_left())*100 * _multiplier;     //maybe add a previous score so the score carries over through victory screens. add hi score fix so restart restarts from 321
                                 // also, add a multiplier of 2 for every contiue on victory
+    _score = score;                            
+    
     // print to LCD i
     char buffer1[14];
-    sprintf(buffer1,"%2d",p1_score);
+    sprintf(buffer1,"%2d",score);
     lcd.printString("SCORE: ",2 ,0);
-    lcd.printString(buffer1,WIDTH/2 -2,0);  // font is 8 wide, so leave 4 pixel gape from middle assuming two digits
+    lcd.printString(buffer1,WIDTH/2 -2,0);  // font is 8 wide, so leave 4 pixel gap from middle assuming two digits
 }
 
 
 int BreakoutEngine::get_prev_score(){
     return _prev_score;
 }
+void BreakoutEngine::set_prev_score(int prev_score){
+    _prev_score = prev_score;
+}
 int BreakoutEngine::get_num_left(){
     return _number_left;
 }
@@ -455,8 +461,8 @@
 void BreakoutEngine::reset_num_left() {
     _number_left = 18;
 }
-int BreakoutEngine::get_mult() {
-    return _multiplier;
+int BreakoutEngine::get_score() {  
+    return _score;
 }
 void BreakoutEngine::inc_mult() {
     _multiplier ++;