Object system implemented

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

SeasonsOfLoneliness.cpp

@@ -22,6 +22,12 @@ enum TILES{
 #define FADE_SPD 6
 #define MOVE_SPD 0.01
 
+class Object{
+	public:
+		float x,y;
+		olc::Decal*spr;
+};
+
 class SeasonsOfLoneliness : public olc::PixelGameEngine
 {
 public:
@@ -46,6 +52,10 @@ public:
 	int MAP_HEIGHT=-1;
 	olc::Decal*TILES;
 	float PLAYER_COORDS[2] = {};
+	std::vector<Object> OBJECTS;
+
+	olc::Decal*DOME_DECAL;
+	std::map<std::string,olc::Decal*> BASE_OBJECTS;
 
 	void LoadMap(char*mapName) {
 		std::ifstream f("assets/maps/map1");
@@ -57,6 +67,7 @@ public:
 			}
 			free(MAP);
 		}
+
 		int y=0;
 		if (f.is_open()) {
 			while (f.good()) {
@@ -68,7 +79,8 @@ public:
 				if (MAP_HEIGHT==-1) {
 					std::stringstream stream(data);
 					stream>>MAP_HEIGHT;
-				} else {
+				} else 
+				if (y<MAP_HEIGHT) {
 					if (MAP==NULL) {
 						MAP=(int**)malloc(sizeof(int**)*MAP_HEIGHT);
 					}
@@ -77,6 +89,16 @@ public:
 						MAP[y][i]=data[i]-'0';
 					}
 					y++;
+				} else {
+					Object obj;
+					std::stringstream split1(data.substr(0,data.find(';')));
+					split1>>obj.x;
+					std::stringstream split2(data.substr(data.find(';')+1,data.find(';',data.find(";")+1)-(data.find(';')+1)));
+					split2>>obj.y;
+					std::string split3 = data.substr(data.find(';',data.find(";")+1)+1,data.length()-(data.find(';',data.find(";")+1)+1));
+					obj.spr=BASE_OBJECTS[split3];
+					printf("Loaded object %s: (%f,%f)\n",split3.c_str(),obj.x,obj.y);
+					OBJECTS.push_back(obj);
 				}
 			}
 		}
@@ -95,6 +117,8 @@ public:
 		//ConsoleCaptureStdOut(true);
 		// Called once at the start, so create things here
 		TILES=new olc::Decal(new olc::Sprite("assets/tiles.png"));
+		DOME_DECAL=new olc::Decal(new olc::Sprite("assets/dome.png"));
+		BASE_OBJECTS["DOME"]=DOME_DECAL;
 		LoadMap("map1");
 		return true;
 	}
@@ -217,6 +241,9 @@ public:
 						}
 					}
 				}
+				for (auto&obj:OBJECTS) {
+					DrawDecal({(obj.x-PLAYER_COORDS[0])*32+WIDTH/2,(obj.y-PLAYER_COORDS[1])*32+HEIGHT/2},obj.spr);
+				}
 			}break;
 		}
 		FillRectDecal({0,0},{WIDTH,HEIGHT},olc::Pixel(0,0,0,transparency));

assets/maps/map1

@@ -39,3 +39,4 @@
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+38;18;DOME