Diff: SceneCreator/SceneCreator.cpp

Revision:

10:4fda7b01484a

Parent:

9:ac396c818874

Child:

11:7f3e9bc7366d

diff -r ac396c818874 -r 4fda7b01484a SceneCreator/SceneCreator.cpp
--- a/SceneCreator/SceneCreator.cpp	Thu Apr 25 01:31:32 2019 +0000
+++ b/SceneCreator/SceneCreator.cpp	Fri Apr 26 02:31:11 2019 +0000
@@ -13,85 +13,79 @@
    this->deletebutton();
 }
 
-void SceneCreator::Scenesp(N5110 &lcd, CaMove &CM,short int spl,short int spx,short int spy, Direction spd) {
+void SceneCreator::Scenesp(N5110 &lcd, CaMove &CM,short int spl,short int spx,short int spy, Direction spd, int rng) {
     CM.init(spx,spy,spd);
+    CM.AIinit();
+    lcd.normalMode();
     this->set_sreg(CM,spl);
-    short int progress = 0;
     bool p[6] = {true,true,true,true,true,true};
     while(!dead && CM.in_screen()) {
         lcd.clear();
         Bitmap::renderBMP(SCN[spl],lcd,0,0);
         if (p[0]) {
-            this->pre_func0(spl,lcd);
+            this->pre_func0(spl,lcd,CM,rng);
         }
         if (p[1]) {
-            this->pre_func1(spl,lcd);
+            this->pre_func1(spl,lcd,CM,rng);
         }
         if (p[2]) {
-            this->pre_func2(spl,lcd);
+            this->pre_func2(spl,lcd,CM,rng);
         }
         if (p[3]) {
-            this->pre_func3(spl,lcd);
+            this->pre_func3(spl,lcd,CM,rng);
         }
         if (p[4]) {
-            this->pre_func4(spl,lcd);
+            this->pre_func4(spl,lcd,CM,rng);
         }
         if (p[5]) {
-            this->pre_func5(spl,lcd);
+            this->pre_func5(spl,lcd,CM,rng);
         }
         CM.move(lcd);
-        CM.chase(lcd);
+        CM.chase(lcd,spl);
         switch(CM.get_treg()) {
             case 0:
                 if(p[0]) {
                     p[0] = false;
-                    progress++;
                     this->flash(lcd);
                 }
-                this->pos_func0(spl,lcd);
+                this->pos_func0(spl,lcd,CM,rng);
             break;
             case 1:
                 if(p[1]) {
                     p[1] = false;
-                    progress++;
                     this->flash(lcd);
                 }
-                this->pos_func1(spl,lcd);
+                this->pos_func1(spl,lcd,CM,rng);
             break;
             case 2:
                 if(p[2]) {
                     p[2] = false;
-                    progress++;
                     this->flash(lcd);
                 }
-                this->pos_func2(spl,lcd);
+                this->pos_func2(spl,lcd,CM,rng);
             break;
             case 3:
                 if(p[3]) {
                     p[3] = false;
-                    progress++;
                     this->flash(lcd);
                 }
-                this->pos_func3(spl,lcd);
+                this->pos_func3(spl,lcd,CM,rng);
             break;
             case 4:
                 if(p[4]) {
                     p[4] = false;
-                    progress++;
                     this->flash(lcd);
                 }
-                this->pos_func4(spl,lcd);
+                this->pos_func4(spl,lcd,CM,rng);
             break;
             case 5:
                 if(p[5]) {
                     p[5] = false;
-                    progress++;
                     this->flash(lcd);
                 }
-                this->pos_func5(spl,lcd);
+                this->pos_func5(spl,lcd,CM,rng);
             break;
         };
-        //ai chaser
         if (CM.is_caught()) {
             dead = true;
         }
@@ -111,8 +105,10 @@
         this->set_scene1(CM);
         break;
         case 2:
+        this->set_scene2(CM);
         break;
         case 3:
+        this->set_scene3(CM);
         break;
         case 4:
         break;
@@ -121,7 +117,7 @@
 
 //Function Pointers Failing mbed in-capable
 //pre-func
-void SceneCreator::pre_func0(int sce,N5110 &lcd) {
+void SceneCreator::pre_func0(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         this->obj0_scene0(lcd);
@@ -130,15 +126,17 @@
         this->obj0_scene1(lcd);
         break;
         case 2:
+        this->obj0_scene2(lcd);
         break;
         case 3:
+        this->obj0_scene3(lcd);
         break;
         case 4:
         break;
     }
 }
 
-void SceneCreator::pre_func1(int sce,N5110 &lcd) {
+void SceneCreator::pre_func1(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -146,15 +144,17 @@
         this->obj1_scene1(lcd);
         break;
         case 2:
+        this->obj1_scene2(lcd,rng);
         break;
         case 3:
+        this->obj1_scene3(lcd);
         break;
         case 4:
         break;  
     }
 }
 
-void SceneCreator::pre_func2(int sce,N5110 &lcd) {
+void SceneCreator::pre_func2(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -169,7 +169,7 @@
     }
 }
 
-void SceneCreator::pre_func3(int sce,N5110 &lcd) {
+void SceneCreator::pre_func3(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -178,13 +178,14 @@
         case 2:
         break;
         case 3:
+        this->obj3_scene3(lcd);
         break;
         case 4:
         break;
     }
 }
 
-void SceneCreator::pre_func4(int sce,N5110 &lcd) {
+void SceneCreator::pre_func4(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -193,13 +194,14 @@
         case 2:
         break;
         case 3:
+        this->obj4_scene3(lcd);
         break;
         case 4:
         break;
     }
 }
 
-void SceneCreator::pre_func5(int sce,N5110 &lcd) {
+void SceneCreator::pre_func5(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -215,7 +217,7 @@
 }
 //pos func
 
-void SceneCreator::pos_func0(int sce,N5110 &lcd) {
+void SceneCreator::pos_func0(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         this->event0_scene0(lcd);
@@ -224,15 +226,17 @@
         this->event0_scene1(lcd);
         break;
         case 2:
+        this->event0_scene2(lcd,CM);
         break;
         case 3:
+        this->event0_scene3(lcd);
         break;
         case 4:
         break;
     }
 }
 
-void SceneCreator::pos_func1(int sce,N5110 &lcd) {
+void SceneCreator::pos_func1(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         this->event1_scene0(lcd);
@@ -243,13 +247,47 @@
         case 2:
         break;
         case 3:
+        this->event1_scene3(lcd);
         break;
         case 4:
         break;
     }
 }
 
-void SceneCreator::pos_func2(int sce,N5110 &lcd) {
+void SceneCreator::pos_func2(int sce,N5110 &lcd,CaMove &CM,int rng) {
+    switch(sce) {
+        case 0:
+        break;
+        case 1:
+        break;
+        case 2:
+        break;
+        case 3:
+        this->event2_scene3(lcd);
+        break;
+        case 4:
+        break;
+    }
+}
+
+
+void SceneCreator::pos_func3(int sce,N5110 &lcd,CaMove &CM,int rng) {
+    switch(sce) {
+        case 0:
+        break;
+        case 1:
+        break;
+        case 2:
+        break;
+        case 3:
+        this->event3_scene3(lcd,CM);
+        break;
+        case 4:
+        break;
+    }
+}
+
+void SceneCreator::pos_func4(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -264,8 +302,7 @@
     }
 }
 
-
-void SceneCreator::pos_func3(int sce,N5110 &lcd) {
+void SceneCreator::pos_func5(int sce,N5110 &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -280,33 +317,3 @@
     }
 }
 
-void SceneCreator::pos_func4(int sce,N5110 &lcd) {
-    switch(sce) {
-        case 0:
-        break;
-        case 1:
-        break;
-        case 2:
-        break;
-        case 3:
-        break;
-        case 4:
-        break;
-    }
-}
-
-void SceneCreator::pos_func5(int sce,N5110 &lcd) {
-    switch(sce) {
-        case 0:
-        break;
-        case 1:
-        break;
-        case 2:
-        break;
-        case 3:
-        break;
-        case 4:
-        break;
-    }
-}
-