Finalized the external splitting of files

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>

cutscene.h

@@ -1,4 +1,7 @@
+#ifndef CUTSCENE_H
+#define CUTSCENE_H
 #include "pixelGameEngine.h"
+#include "flags.h"
 
 #define CAMERA_MOVESPD 5
 #define BATTLE_CAMERA_MOVESPD 2.5
@@ -324,3 +327,4 @@ class Cutscene{
             return storedVal;
         }
 };
+#endif

flags.h

@@ -1,5 +1,7 @@
 #ifndef FLAGS_H
 #define FLAGS_H
+#include "pixelGameEngine.h"
+using namespace olc;
 enum class Flag:int{
     NONE,
     TEST_FLAG1,

layers.h

@@ -1,4 +1,5 @@
-
+#ifndef LAYER_H
+#define LAYER_H
 
 namespace layer{
 	enum layer{
@@ -12,3 +13,4 @@ namespace layer{
 		ENCOUNTER, //The encounter layer doesn't actually exist, it's used to tell the editor we are adding encounters instead.
 	};
 }
+#endif

main.cpp

@@ -31,19 +31,6 @@ enum{
 	SIGMA=Σ,
 };
 
-namespace layer{
-	enum layer{
-		INTERFACE, //Interface items should be on this layer. On top of everything.
-		COLLISION, //Collision checking layer. This layer is
-		HIGH,
-		DYNAMIC,
-		GROUND,
-		BACKGROUND,
-		OBJECT, //The object layer doesn't actually exist, it's used to tell the editor we are adding an object instead.
-		ENCOUNTER, //The encounter layer doesn't actually exist, it's used to tell the editor we are adding encounters instead.
-	};
-}
-
 enum class BattleMoveName{
     TESTMOVE1,
     TESTMOVE2,

object.cpp

@@ -1,42 +1,35 @@
 #include "object.h"
-#include "layers.h"
-#include "defines.h"
 
 extern std::vector<Object*> OBJECTS;
 
-bool Object::Collision(vd2d pos){
-    GAME->SetDrawTarget(layer::COLLISION);
-    Pixel collisionData = GAME->GetDrawTarget()->GetPixel((int)pos.x-cameraPos.x,(int)pos.y-cameraPos.y);
-    return collisionData!=MAGENTA;
-}
 void Object::Move(vd2d move) {
-    if (move.y==0) {
+	if (move.y==0) {
-        pos+=move;
+		pos+=move;
-        return;
+		return;
-    } else {
+	} else {
-        if (move.y<0) {
+		if (move.y<0) {
-            while (objArrElement>0&&OBJECTS[objArrElement-1]->pos.y+OBJECTS[objArrElement-1]->originPoint.y>pos.y+originPoint.y+move.y) {
+			while (objArrElement>0&&OBJECTS[objArrElement-1]->pos.y+OBJECTS[objArrElement-1]->originPoint.y>pos.y+originPoint.y+move.y) {
-                //printf("%p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str());
+				//printf("%p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str());
-                OBJECTS[objArrElement]=OBJECTS[objArrElement-1];
+				OBJECTS[objArrElement]=OBJECTS[objArrElement-1];
-                //printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str());
+				//printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str());
-                OBJECTS[objArrElement-1]=this;
+				OBJECTS[objArrElement-1]=this;
-                //printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str());
+				//printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str());
-                OBJECTS[objArrElement]->objArrElement=objArrElement;
+				OBJECTS[objArrElement]->objArrElement=objArrElement;
-                //printf(" %p(%s)(%d)<->%p(%s)(%d)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement]->objArrElement,OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str(),objArrElement-1);
+				//printf(" %p(%s)(%d)<->%p(%s)(%d)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement]->objArrElement,OBJECTS[objArrElement-1],OBJECTS[objArrElement-1]->name.c_str(),objArrElement-1);
-                objArrElement--;
+				objArrElement--;
-            }
+			}
-        } else {
+		} else {
-            while (objArrElement<OBJECTS.size()-1&&OBJECTS[objArrElement+1]->pos.y+OBJECTS[objArrElement+1]->originPoint.y<pos.y+originPoint.y+move.y) {
+			while (objArrElement<OBJECTS.size()-1&&OBJECTS[objArrElement+1]->pos.y+OBJECTS[objArrElement+1]->originPoint.y<pos.y+originPoint.y+move.y) {
-                //printf("%p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str());
+				//printf("%p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str());
-                OBJECTS[objArrElement]=OBJECTS[objArrElement+1];
+				OBJECTS[objArrElement]=OBJECTS[objArrElement+1];
-                //printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str());
+				//printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str());
-                OBJECTS[objArrElement+1]=this;
+				OBJECTS[objArrElement+1]=this;
-                //printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str());
+				//printf(" %p(%s)<->%p(%s)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str());
-                OBJECTS[objArrElement]->objArrElement=objArrElement;
+				OBJECTS[objArrElement]->objArrElement=objArrElement;
-                //printf(" %p(%s)(%d)<->%p(%s)(%d)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement]->objArrElement,OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str(),objArrElement+1);
+				//printf(" %p(%s)(%d)<->%p(%s)(%d)\n",OBJECTS[objArrElement],OBJECTS[objArrElement]->name.c_str(),OBJECTS[objArrElement]->objArrElement,OBJECTS[objArrElement+1],OBJECTS[objArrElement+1]->name.c_str(),objArrElement+1);
-                objArrElement++;
+				objArrElement++;
-            }
+			}
-        }
+		}
-        pos+=move;
+		pos+=move;
-    }
+	}
 }

object.h

@@ -3,6 +3,8 @@
 #include "pixelGameEngine.h"
 #include "flags.h"
 #include "animation.h"
+#include "defines.h"
+#include "layers.h"
 using namespace olc;
 
 class Object{
@@ -28,7 +30,11 @@ class Object{
 		int blinkFrames=0; //Frame count of how much time is left for the image to be blinking. Used when enemies take damage.
 		//animationSpd is how long to wait before switching frames.
 		bool highlighted=false; //Whether or not this object has been declared as highlighted by a target range selector.
-		bool Collision(vd2d pos);
+		bool Collision(vd2d pos) {
+			GAME->SetDrawTarget(layer::COLLISION);
+			Pixel collisionData = GAME->GetDrawTarget()->GetPixel((int)pos.x-cameraPos.x,(int)pos.y-cameraPos.y);
+			return collisionData!=MAGENTA;
+		}
 		//A grid version of the constructor. used ONLY for battle setups.
 		Object(int id,std::string name,int gridx,int gridy,Animation*spr,vd2d scale={1,1},Pixel color=WHITE,int animationSpd=1,bool temp=false)
 		:Object(id,name,{gridx*32-(spr->width*0.5)*(scale.x-1),gridy*32-(spr->spr->sprite->height-4)*(scale.y-1)},spr,scale,color,animationSpd,temp) {}

references.h

@@ -1,3 +1,5 @@
+#ifndef REFERENCES_H
+#define REFERENCES_H
 enum Reference{
     PLAYER,
     NESS,
@@ -165,3 +167,4 @@ namespace cutscene{
         TEST_CUTSCENE
     };
 }
+#endif

states.h

@@ -1,3 +1,5 @@
+#ifndef STATES_H
+#define STATES_H
 namespace GameState{
     enum{
         EDITOR,
@@ -21,3 +23,4 @@ namespace BattleState{
         MOVE_SELECT,
     };
 }
+#endif

tiles.h

@@ -1,3 +1,6 @@
+#ifndef TILES_H
+#define TILES_H
+#include "pixelGameEngine.h"
 using namespace olc;
 
 class TILE{
@@ -9,3 +12,4 @@ class TILE{
             this->tileY=tileY;
         };
 };
+#endif