Diff: SceneCreator/SceneCreator.cpp

Revision:

17:7d4d8905b608

Parent:

15:3d29fb195958

Child:

18:14e5391beccf

--- a/SceneCreator/SceneCreator.cpp	Tue May 07 21:26:26 2019 +0000
+++ b/SceneCreator/SceneCreator.cpp	Wed May 08 00:30:09 2019 +0000
@@ -20,7 +20,7 @@
 }
 
 //Primary Function
-void SceneCreator::Scenesp(N5110 &lcd, CaMove &CM,short int spl,short int spx,short int spy, Direction spd, int rng,WDplayer &wav) {
+void SceneCreator::Scenesp(Bitmap &lcd, CaMove &CM,short int spl,short int spx,short int spy, Direction spd, int rng,WDplayer &wav) {
     //Setting up WDplayer, CaMove and Scene interative regions
     wav.ISRset();
     CM.init(spx,spy,spd);
@@ -36,7 +36,7 @@
         lcd.clear();
         //reload WDplayer data then Load map data
         wav.ISRpreload();
-        Bitmap::renderBMP(SCN[spl],lcd,0,0);
+        lcd.renderBMP(SCN[spl],0,0);
         //CORE_1 (Pre Events Engine)
         this->Core_1(lcd, CM,spl,rng,p);
         //Charater and Chaser Model Update
@@ -64,7 +64,7 @@
 };
 
 //CORE_1 (Pre EVENTS)
-void SceneCreator::Core_1(N5110 &lcd, CaMove &CM,short int spl,int rng,bool p[6]) {
+void SceneCreator::Core_1(Bitmap &lcd, CaMove &CM,short int spl,int rng,bool p[6]) {
     if (p[0]) {
             this->pre_func0(spl,lcd,CM,rng);
         }
@@ -86,7 +86,7 @@
 }
 
 //CORE_2 (Pos EVENTs)
-void SceneCreator::Core_2(N5110 &lcd, CaMove &CM,short int spl,int rng,bool (&p)[6],WDplayer &wav) {
+void SceneCreator::Core_2(Bitmap &lcd, CaMove &CM,short int spl,int rng,bool (&p)[6],WDplayer &wav) {
     //Checks which region triggered
     switch(CM.get_treg()) {
             case 0:
@@ -175,7 +175,7 @@
 }
 
 //pre-func
-void SceneCreator::pre_func0(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pre_func0(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         this->obj0_scene0(lcd);
@@ -194,7 +194,7 @@
     }
 }
 
-void SceneCreator::pre_func1(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pre_func1(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -213,7 +213,7 @@
     }
 }
 
-void SceneCreator::pre_func2(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pre_func2(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -229,7 +229,7 @@
     }
 }
 
-void SceneCreator::pre_func3(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pre_func3(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -246,7 +246,7 @@
     }
 }
 
-void SceneCreator::pre_func4(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pre_func4(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -262,7 +262,7 @@
     }
 }
 
-void SceneCreator::pre_func5(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pre_func5(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -278,7 +278,7 @@
 }
 //pos func
 
-void SceneCreator::pos_func0(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pos_func0(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         this->event0_scene0(lcd);
@@ -298,7 +298,7 @@
     }
 }
 
-void SceneCreator::pos_func1(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pos_func1(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         this->event1_scene0(lcd);
@@ -316,7 +316,7 @@
     }
 }
 
-void SceneCreator::pos_func2(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pos_func2(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -333,7 +333,7 @@
 }
 
 
-void SceneCreator::pos_func3(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pos_func3(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -349,7 +349,7 @@
     }
 }
 
-void SceneCreator::pos_func4(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pos_func4(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;
@@ -364,7 +364,7 @@
     }
 }
 
-void SceneCreator::pos_func5(int sce,N5110 &lcd,CaMove &CM,int rng) {
+void SceneCreator::pos_func5(int sce,Bitmap &lcd,CaMove &CM,int rng) {
     switch(sce) {
         case 0:
         break;