Now into OpenFileMap

Problem: it's much more complex
ioan-chera · Nov 6, 2023 · 89bcf4c · 89bcf4c
1 parent e94f84e
commit 89bcf4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/m_loadsave.cc b/src/m_loadsave.cc
@@ -974,7 +974,7 @@ void Instance::LoadLevelNum(const Wad_file *wad, int lev_num)
 // open a new wad file.
 // when 'map_name' is not NULL, try to open that map.
 //
-void OpenFileMap(const fs::path &filename, const SString &map_namem)
+void OpenFileMap(const fs::path &filename, const SString &map_namem) noexcept(false)
 {
 	// TODO: change this to start a new instance
 	SString map_name = map_namem;
@@ -1051,6 +1051,8 @@ void OpenFileMap(const fs::path &filename, const SString &map_namem)
 	// must be after LoadLevel as we need the Level_format
 	// TODO: same here
 	gInstance.Main_LoadResources(gInstance.loaded);
+
+	// TODO: RESTORE loaded, wad.master, LoadLevel ON FAILURE
 }
 
 

diff --git a/src/m_loadsave.h b/src/m_loadsave.h
@@ -50,7 +50,7 @@ struct LoadingData
 	MapFormat levelFormat = {};	// format of current map
 };
 
-void OpenFileMap(const fs::path &filename, const SString &map_name = "");
+void OpenFileMap(const fs::path &filename, const SString &map_name = "") noexcept(false);
 
 #endif  /* __EUREKA_E_LOADSAVE_H__ */