data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir

3 files changed, 4 insertions, 4 deletions

diff --git a/src/game/client/components/mapimages.cpp b/src/game/client/components/mapimages.cpp
index d13524cd..9dc2447a 100644
--- a/src/game/client/components/mapimages.cpp
+++ b/src/game/client/components/mapimages.cpp
@@ -31,7 +31,7 @@ void MAPIMAGES::on_reset()
 		{
 			char buf[256];
 			char *name = (char *)map_get_data(img->image_name);
-			str_format(buf, sizeof(buf), "data/mapres/%s.png", name);
+			str_format(buf, sizeof(buf), "mapres/%s.png", name);
 			textures[i] = gfx_load_texture(buf, IMG_AUTO, 0);
 		}
 		else
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index f28a3197..5fe2bbaa 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -1030,7 +1030,7 @@ void MENUS::render_background()
 	//gfx_clear(1,1,1);
 	//render_sunrays(0,0);
 	if(texture_blob == -1)
-		texture_blob = gfx_load_texture("data/blob.png", IMG_AUTO, 0);
+		texture_blob = gfx_load_texture("blob.png", IMG_AUTO, 0);
 
 
 	float sw = 300*gfx_screenaspect();
diff --git a/src/game/client/components/skins.cpp b/src/game/client/components/skins.cpp
index eae45c4d..b12bc1cf 100644
--- a/src/game/client/components/skins.cpp
+++ b/src/game/client/components/skins.cpp
@@ -24,7 +24,7 @@ void SKINS::skinscan(const char *name, int is_dir, void *user)
 		return;
 		
 	char buf[512];
-	str_format(buf, sizeof(buf), "data/skins/%s", name);
+	str_format(buf, sizeof(buf), "skins/%s", name);
 	IMAGE_INFO info;
 	if(!gfx_load_png(&info, buf))
 	{
@@ -119,7 +119,7 @@ void SKINS::init()
 {
 	// load skins
 	num_skins = 0;
-	fs_listdir("data/skins", skinscan, this);
+	fs_listdir("skins", skinscan, this);
 }
 
 int SKINS::num()