Diff: main.cpp

Revision:

38:db41ff8c0e00

Parent:

37:44d2cbbd8507

Child:

40:5f44e4081eb8

--- a/main.cpp	Thu Dec 13 02:29:12 2018 +0000
+++ b/main.cpp	Thu Dec 13 02:44:10 2018 +0000
@@ -30,8 +30,7 @@
 
 void game_paused() {
     // Cycle through LEDs
-    left.speed(0.0);
-    right.speed(0.0);
+    sstate = pause;
     Thread pause_thread;
     pause_thread.start(check_unpause);
     while (paused) {
@@ -53,9 +52,7 @@
 }
 
 void win() {
-    Thread pause_thread2;
-    pause_thread2.start(game_paused);
-    while(paused) {
+    while(1) {
         unsigned int rgbColor[3];
         
         // Start off with red.
@@ -77,7 +74,6 @@
             }
         }
     }
-    pause_thread2.terminate();
 }
 
 // Thread to control speed
@@ -105,6 +101,10 @@
             right.speed(speed_cmd * right_multiplier);
             ThisThread::sleep_for(200);
         }
+        while(sstate == pause) {
+            left.speed(0.0);
+            right.speed(0.0);
+        }
     }
 }
 
@@ -114,6 +114,7 @@
             max_speed = 1.0;
             ThisThread::sleep_for(5000);
             max_speed = 0.8;
+            powerup = false;
         }
         ThisThread::sleep_for(300);
     }