From 1e08589403537309af7ec8bbb05f89dc52601961 Mon Sep 17 00:00:00 2001
From: Nic0Nic0Nii <sigonasr2@yahoo.com>
Date: Wed, 26 Jul 2023 20:37:52 +0000
Subject: [PATCH] Include all map initializations and use configuration file

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
---
 Crawler/Crawler.cpp                     | 14 ++++++++++++--
 Crawler/Map.h                           |  5 +++--
 Crawler/assets/config/configuration.txt |  5 ++++-
 Crawler/assets/config/levels.txt        | 11 +++++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 Crawler/assets/config/levels.txt

diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp
index 0c608b8a..1da3efd2 100644
--- a/Crawler/Crawler.cpp
+++ b/Crawler/Crawler.cpp
@@ -47,11 +47,21 @@ Crawler::Crawler()
 	std::string GFX_CONFIG = CONFIG_PATH + "gfx_config"_S;
 	utils::datafile::Read(DATA,GFX_CONFIG);
 	WINDOW_SIZE={"WINDOW_SIZE"_i[0],"WINDOW_SIZE"_i[1]};
-	std::cout<<WINDOW_SIZE<<std::endl;
+
+	std::string MAP_CONFIG = CONFIG_PATH + "map_config"_S;
+	utils::datafile::Read(DATA,MAP_CONFIG);
 }
 
 bool Crawler::OnUserCreate(){
-	InitializeLevel("assets/Campaigns/1_1.tmx",CAMPAIGN_1_1);
+
+	#define INITLEVEL(map) InitializeLevel("map_path"_S + "Levels."#map ## _S,map);
+
+	INITLEVEL(WORLD_MAP);
+
+	INITLEVEL(CAMPAIGN_1_1);
+	INITLEVEL(BOSS_1);
+
+	INITLEVEL(CAMPAIGN_1_2);
 
 	player=std::make_unique<Warrior>();
 
diff --git a/Crawler/Map.h b/Crawler/Map.h
index f7285add..0dd7e3fc 100644
--- a/Crawler/Map.h
+++ b/Crawler/Map.h
@@ -4,9 +4,10 @@
 struct XMLTag;
 
 enum MapName{
-	LEVEL1,
-	LEVEL2,
 	CAMPAIGN_1_1,
+	CAMPAIGN_1_2,
+	BOSS_1,
+	WORLD_MAP
 };
 
 struct TileCollisionData{
diff --git a/Crawler/assets/config/configuration.txt b/Crawler/assets/config/configuration.txt
index a9ae8ef1..8c27a6d7 100644
--- a/Crawler/assets/config/configuration.txt
+++ b/Crawler/assets/config/configuration.txt
@@ -4,4 +4,7 @@ config_path = assets/config/
 WINDOW_SIZE = 360,240
 
 # Graphics Loading Config
-gfx_config = gfx/gfx.txt
\ No newline at end of file
+gfx_config = gfx/gfx.txt
+
+# Map Files Loading Config
+map_config = levels.txt
\ No newline at end of file
diff --git a/Crawler/assets/config/levels.txt b/Crawler/assets/config/levels.txt
new file mode 100644
index 00000000..8d8551ed
--- /dev/null
+++ b/Crawler/assets/config/levels.txt
@@ -0,0 +1,11 @@
+map_path = assets/Campaigns/
+
+Levels
+{
+    WORLD_MAP       =   World_Map.tmx
+
+    CAMPAIGN_1_1    =   1_1.tmx
+    BOSS_1          =   Boss_1.tmx
+
+    CAMPAIGN_1_2    =   1_2.tmx
+}
\ No newline at end of file