Merge pull request #1696 from reicast/skmp/bettter-bios-error

UI: Say where to put the bios when not found, cleanups

Author: skmp

libswirl/hw/naomi/naomi_cart.cpp

@@ -53,11 +53,8 @@ static bool naomi_LoadBios(const char *filename, Archive *child_archive, Archive
 
 	struct BIOS_t *bios = &BIOS[biosid];
 
-#if HOST_OS != OS_DARWIN
-	std::string basepath = get_readonly_data_path("/data/");
-#else
-	std::string basepath = get_readonly_data_path("/");
-#endif
+	std::string basepath = get_readonly_data_path(DATA_PATH);
+
 	Archive *bios_archive = OpenArchive((basepath + filename).c_str());
 
 	bool found_region = false;

libswirl/hw/sh4/sh4_mem.cpp

@@ -215,7 +215,7 @@ void mem_Term()
 	sh4_area0_Term();
 
 	//write back Flash/SRAM
-	SaveRomFiles(get_writable_data_path("/data/"));
+	SaveRomFiles(get_writable_data_path(DATA_PATH));
 
 	//mem_b.Term(); // handled by vmem
 

libswirl/libswirl.cpp

@@ -302,12 +302,6 @@ int reicast_init(int argc, char* argv[])
 	return 0;
 }
 
-#if HOST_OS != OS_DARWIN
-#define DATA_PATH "/data/"
-#else
-#define DATA_PATH "/"
-#endif
-
 bool game_started;
 
 int dc_start_game(const char *path)
@@ -450,7 +444,7 @@ void* dc_run(void*)
 
 		sh4_cpu.Run();
 
-   		SaveRomFiles(get_writable_data_path("/data/"));
+   		SaveRomFiles(get_writable_data_path(DATA_PATH));
    		if (reset_requested)
    		{
    			dc_reset();
@@ -838,7 +832,7 @@ static string get_savestate_file_path()
 	if (lastindex != -1)
 		state_file = state_file.substr(0, lastindex);
 	state_file = state_file + ".state";
-	return get_writable_data_path("/data/") + state_file;
+	return get_writable_data_path(DATA_PATH) + state_file;
 }
 
 void dc_savestate()

libswirl/rend/gles/CustomTexture.cpp

@@ -103,7 +103,7 @@ bool CustomTexture::Init()
 		std::string game_id = GetGameId();
 		if (game_id.length() > 0)
 		{
-			textures_path = get_readonly_data_path("/data/") + "textures/" + game_id + "/";
+			textures_path = get_readonly_data_path(DATA_PATH) + "textures/" + game_id + "/";
 
 			DIR *dir = opendir(textures_path.c_str());
 			if (dir != NULL)
@@ -166,7 +166,7 @@ void CustomTexture::LoadCustomTextureAsync(TextureCacheData *texture_data)
 
 void CustomTexture::DumpTexture(u32 hash, int w, int h, GLuint textype, void *temp_tex_buffer)
 {
-	std::string base_dump_dir = get_writable_data_path("/data/texdump/");
+	std::string base_dump_dir = get_writable_data_path(DATA_PATH "texdump/");
 	if (!file_exists(base_dump_dir))
 		make_directory(base_dump_dir);
 	std::string game_id = GetGameId();

libswirl/rend/gles/glesrend.cpp

@@ -750,7 +750,7 @@ void gl_load_osd_resources()
 #ifdef _ANDROID
 	int w, h;
 	if (osd_tex == 0)
-		osd_tex = loadPNG(get_readonly_data_path("/data/buttons.png"), w, h);
+		osd_tex = loadPNG(get_readonly_data_path(DATA_PATH "buttons.png"), w, h);
 #endif
 }
 

libswirl/rend/gui.cpp

@@ -1443,6 +1443,9 @@ static void gui_display_demo()
 
 static void gui_start_game(const std::string& path)
 {
+
+	auto bios_path = get_readonly_data_path(DATA_PATH);
+
 	int rc = dc_start_game(path.empty() ? NULL : path.c_str());
 	if (rc != 0)
 	{
@@ -1454,7 +1457,7 @@ static void gui_start_game(const std::string& path)
 			error_msg = "Audio/video initialization failed";
 			break;
 		case -5:
-			error_msg = "Cannot find BIOS files";
+			error_msg = "Please put Dreamcast BIOS in " + bios_path;
 			break;
 		case -6:
 			error_msg = "Cannot load NAOMI rom or BIOS";

libswirl/stdclass.cpp

@@ -120,7 +120,7 @@ string get_game_save_prefix()
 #endif
 	if (lastindex != -1)
 		save_file = save_file.substr(lastindex + 1);
-	return get_writable_data_path("/data/") + save_file;
+	return get_writable_data_path(DATA_PATH) + save_file;
 }
 
 string get_game_basename()

libswirl/stdclass.h

@@ -154,6 +154,12 @@ class Array
 	}
 };
 
+#if HOST_OS != OS_DARWIN
+	#define DATA_PATH "/data/"
+#else
+	#define DATA_PATH "/"
+#endif
+
 //Set the path !
 void set_user_config_dir(const string& dir);
 void set_user_data_dir(const string& dir);