Diff: SceneCreator/SceneFunctions.cpp

Revision:

21:f3b0ce18b44f

Parent:

17:7d4d8905b608

Child:

26:716bcd47f3ca

--- a/SceneCreator/SceneFunctions.cpp	Wed May 08 15:48:44 2019 +0000
+++ b/SceneCreator/SceneFunctions.cpp	Thu May 09 06:22:53 2019 +0000
@@ -9,7 +9,14 @@
     _p[0] = true;
     _p[1] = true;
     _p[2] = true;
-    }
+}
+
+void SceneFunctions::reset_variables() {
+    _progress = 0;
+    _p[0] = true;
+    _p[1] = true;
+    _p[2] = true;
+}
 
 void SceneFunctions::deletebutton() {
      delete _BOK;
@@ -158,7 +165,7 @@
 }
 
 //pos Function
-void SceneFunctions::event0_scene2(Bitmap &lcd,CaMove &CM) {
+void SceneFunctions::event0_scene2(Bitmap &lcd,CaMove &CM,WDplayer &wav) {
     this->transition(lcd);
     lcd.clear();
     lcd.renderBMP(MISC[1],0,0);
@@ -200,7 +207,7 @@
 void SceneFunctions::obj1_scene3(Bitmap &lcd) {
     lcd.setPixel(77,14,false);
 }
-//obj 2 not required
+
 void SceneFunctions::obj3_scene3(Bitmap &lcd) {
     lcd.renderBMP(MISC[2],21,8);
 }
@@ -306,8 +313,9 @@
         }
     }
 }
+Serial x(USBTX,USBRX);
 //pos function
-void SceneFunctions::event0_scene4(Bitmap &lcd,CaMove &CM) {
+void SceneFunctions::event0_scene4(Bitmap &lcd,CaMove &CM,WDplayer &wav) {
     if (_progress == 8) {
         CM.spawn(84,19);
     }