From e6268b0edcb2474ed944eab1733d8a88ac475e5c Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Thu, 22 Jun 2023 05:38:44 -0700
Subject: [PATCH] Can now load maps from other directories.

---
 Crawler/Crawler.cpp                           | 28 +++++++++++++------
 Crawler/Version.h                             |  2 +-
 .../assets/{maps => Campaigns}/1_1_test.tmx   |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)
 rename Crawler/assets/{maps => Campaigns}/1_1_test.tmx (99%)

diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp
index 2c2248ae..ac9894ea 100644
--- a/Crawler/Crawler.cpp
+++ b/Crawler/Crawler.cpp
@@ -29,7 +29,7 @@ Crawler::Crawler()
 bool Crawler::OnUserCreate(){
 	InitializeLevel("assets/maps/Level1.tmx",LEVEL1);
 	InitializeLevel("assets/maps/Level2.tmx",LEVEL2);
-	InitializeLevel("assets/maps/1_1_test.tmx",CAMPAIGN_1_1);
+	InitializeLevel("assets/Campaigns/1_1_test.tmx",CAMPAIGN_1_1);
 
 	//Initialize Camera.
 	camera=Camera2D{WINDOW_SIZE};
@@ -133,7 +133,7 @@ bool Crawler::OnUserCreate(){
 		,{MonsterName::SLIME_BLUE,{(rand()%20/2.f-5)*24,(rand()%20/2.f-5)*24}}
 		}}));
 
-	LoadLevel(LEVEL1);
+	LoadLevel(CAMPAIGN_1_1);
 
 	return true;
 }
@@ -817,10 +817,14 @@ void Crawler::InitializeLevel(std::string mapFile,MapName map){
 	std::string baseDir=mapFile.substr(0,slashMarker+1);
 	MAP_DATA[map]=level.GetData();
 	for(XMLTag&tag:MAP_DATA[map].TilesetData){
-		TSXParser tileset(baseDir+tag.data["source"]);
-		Renderable*r=new Renderable();
-		MAP_TILESETS[baseDir+tag.data["source"]]=r;
-		r->Load("assets/maps/"+tileset.GetData().ImageData.data["source"]);
+		size_t slashMarkerSourceDir = tag.data["source"].find_last_of('/');
+		std::string baseSourceDir=tag.data["source"].substr(slashMarkerSourceDir+1);
+		if(MAP_TILESETS.find("assets/maps/"+baseSourceDir)==MAP_TILESETS.end()){
+			TSXParser tileset(baseDir+tag.data["source"]);
+			Renderable*r=new Renderable();
+			MAP_TILESETS["assets/maps/"+baseSourceDir]=r;
+			r->Load("assets/maps/"+tileset.GetData().ImageData.data["source"]);
+		}
 	}
 }
 
@@ -836,14 +840,20 @@ vi2d Crawler::GetWorldSize(){
 TilesheetData Crawler::GetTileSheet(MapName map,int tileID){
 	std::vector<XMLTag>&tileData=MAP_DATA[map].TilesetData;
 	if(tileData.size()==1){
-		return {*MAP_TILESETS["assets/maps/"+tileData[0].data["source"]],1};
+		size_t slashMarkerSourceDir = tileData[0].data["source"].find_last_of('/');
+		std::string baseSourceDir=tileData[0].data["source"].substr(slashMarkerSourceDir+1);
+		return {*MAP_TILESETS["assets/maps/"+baseSourceDir],1};
 	} else {
 		for (int i=1;i<tileData.size();i++){
 			if(tileID<stoi(tileData[i].data["firstgid"])){
-				return {*MAP_TILESETS["assets/maps/"+tileData[i-1].data["source"]],stoi(tileData[i-1].data["firstgid"])};
+				size_t slashMarkerSourceDir = tileData[i-1].data["source"].find_last_of('/');
+				std::string baseSourceDir=tileData[i-1].data["source"].substr(slashMarkerSourceDir+1);
+				return {*MAP_TILESETS["assets/maps/"+baseSourceDir],stoi(tileData[i-1].data["firstgid"])};
 			}
 		}
-		return {*MAP_TILESETS["assets/maps/"+tileData[tileData.size()-1].data["source"]],stoi(tileData[tileData.size()-1].data["firstgid"])};
+		size_t slashMarkerSourceDir = tileData[tileData.size()-1].data["source"].find_last_of('/');
+		std::string baseSourceDir=tileData[tileData.size()-1].data["source"].substr(slashMarkerSourceDir+1);
+		return {*MAP_TILESETS["assets/maps/"+baseSourceDir],stoi(tileData[tileData.size()-1].data["firstgid"])};
 	}
 }
 
diff --git a/Crawler/Version.h b/Crawler/Version.h
index ba410862..8c656d62 100644
--- a/Crawler/Version.h
+++ b/Crawler/Version.h
@@ -2,7 +2,7 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 2
 #define VERSION_PATCH 0
-#define VERSION_BUILD 157
+#define VERSION_BUILD 175
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/Crawler/assets/maps/1_1_test.tmx b/Crawler/assets/Campaigns/1_1_test.tmx
similarity index 99%
rename from Crawler/assets/maps/1_1_test.tmx
rename to Crawler/assets/Campaigns/1_1_test.tmx
index 2f925643..be164fc0 100644
--- a/Crawler/assets/maps/1_1_test.tmx
+++ b/Crawler/assets/Campaigns/1_1_test.tmx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="186" height="159" tilewidth="24" tileheight="24" infinite="0" nextlayerid="4" nextobjectid="1">
- <tileset firstgid="1" source="grass_tiles_24x24.tsx"/>
+ <tileset firstgid="1" source="../maps/grass_tiles_24x24.tsx"/>
  <layer id="1" name="Kachelebene 1" width="186" height="159">
   <data encoding="csv">
 31,32,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,