Diff: main.cpp

Revision:

3:bf9624e5b0c3

Parent:

2:b5c1bb7a39de

Child:

4:4d673fb2d9dc

diff -r b5c1bb7a39de -r bf9624e5b0c3 main.cpp
--- a/main.cpp	Sat Apr 20 00:08:00 2019 +0000
+++ b/main.cpp	Thu Apr 25 16:31:27 2019 +0000
@@ -44,9 +44,9 @@
     // It will return 0 by default and a 1 when pressed i.e. cause a rising edge
     init();
     // 0.4 appears to be a good starting point
-  //  thread.start(welcome);
-  //  intro();
-  //  thread.terminate(); 
+    thread.start(welcome);
+    intro();
+    thread.terminate(); 
     instruction();   
     render();
     wait(1.0f/fps);
@@ -73,7 +73,7 @@
             case Mission1Fail:
             lcd.clear();
             lcd.drawSprite(6,5,42,73,(int *)mission_fail);
-            lcd.drawSprite(53,12,7,19,(int *)m_one);
+            lcd.drawSprite(53,11,7,19,(int *)m_one);
             lcd.refresh();
             if (pad.check_event(Gamepad::B_PRESSED) == true){
                 currentState = Mission1;
@@ -84,7 +84,7 @@
             case Mission1Pass:
             lcd.clear();
             lcd.drawSprite(0,0,48,84,(int *)mission_pass);
-            lcd.drawSprite(53,12,7,19,(int *)m_one);
+            lcd.drawSprite(53,11,7,19,(int *)m_one);
             lcd.refresh();
             if (pad.check_event(Gamepad::A_PRESSED) == true){
                 currentState = Mission2;
@@ -106,7 +106,7 @@
             case Mission2Fail:
             lcd.clear();
             lcd.drawSprite(6,5,42,73,(int *)mission_fail);
-            lcd.drawSprite(53,13,5,18,(int *)m_two);
+            lcd.drawSprite(53,12,5,18,(int *)m_two);
             lcd.refresh();
             if (pad.check_event(Gamepad::B_PRESSED) == true){
                 currentState = Mission1;
@@ -117,7 +117,7 @@
             case Mission2Pass:
             lcd.clear();
             lcd.drawSprite(0,0,48,84,(int *)mission_pass);
-            lcd.drawSprite(53,13,5,18,(int *)m_two);
+            lcd.drawSprite(53,12,5,18,(int *)m_two);
             lcd.refresh();
             if (pad.check_event(Gamepad::A_PRESSED) == true){
                 currentState = Mission3;
@@ -140,7 +140,7 @@
             case Mission3Fail:
             lcd.clear();
             lcd.drawSprite(6,5,42,73,(int *)mission_fail);
-            lcd.drawSprite(51,13,5,29,(int *)m_three);
+            lcd.drawSprite(51,12,5,29,(int *)m_three);
             lcd.refresh();
             if (pad.check_event(Gamepad::B_PRESSED) == true){
                 currentState = Mission1;
@@ -151,7 +151,7 @@
             case Mission3Pass:
             lcd.clear();
             lcd.drawSprite(0,0,48,84,(int *)mission_pass);
-            lcd.drawSprite(51,13,5,29,(int *)m_three);
+            lcd.drawSprite(51,12,5,29,(int *)m_three);
             lcd.refresh();
             if (pad.check_event(Gamepad::A_PRESSED) == true){
                 currentState = Congratulations;