From: Perttu Ahola Date: Mon, 19 Mar 2012 19:34:21 +0000 (+0200) Subject: Move client textures to the correct place X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=895b970a10f5b37a5dec6f668e745c1531fb6ebf;p=zefram%2Fminetest%2Fminetest_engine.git Move client textures to the correct place --- diff --git a/share/client/textures/fontdejavusansmono.png b/share/client/textures/fontdejavusansmono.png deleted file mode 100644 index 416a74f8..00000000 Binary files a/share/client/textures/fontdejavusansmono.png and /dev/null differ diff --git a/share/client/textures/fontlucida.png b/share/client/textures/fontlucida.png deleted file mode 100644 index c63fa02b..00000000 Binary files a/share/client/textures/fontlucida.png and /dev/null differ diff --git a/share/client/textures/menubg.png b/share/client/textures/menubg.png deleted file mode 100644 index 7cb9c89a..00000000 Binary files a/share/client/textures/menubg.png and /dev/null differ diff --git a/share/client/textures/menulogo.png b/share/client/textures/menulogo.png deleted file mode 100644 index 76595c48..00000000 Binary files a/share/client/textures/menulogo.png and /dev/null differ diff --git a/share/client/textures/smoke_puff.png b/share/client/textures/smoke_puff.png deleted file mode 100644 index e346d204..00000000 Binary files a/share/client/textures/smoke_puff.png and /dev/null differ diff --git a/share/client/textures/sunrisebg.png b/share/client/textures/sunrisebg.png deleted file mode 100644 index d8b010eb..00000000 Binary files a/share/client/textures/sunrisebg.png and /dev/null differ diff --git a/share/client/textures/unknown_block.png b/share/client/textures/unknown_block.png deleted file mode 100644 index a27cb8ca..00000000 Binary files a/share/client/textures/unknown_block.png and /dev/null differ diff --git a/share/client/textures/unknown_item.png b/share/client/textures/unknown_item.png deleted file mode 100644 index 35cabf0a..00000000 Binary files a/share/client/textures/unknown_item.png and /dev/null differ diff --git a/share/client/textures/unknown_object.png b/share/client/textures/unknown_object.png deleted file mode 100644 index 4d6a98d5..00000000 Binary files a/share/client/textures/unknown_object.png and /dev/null differ diff --git a/share/textures/base/pack/fontdejavusansmono.png b/share/textures/base/pack/fontdejavusansmono.png new file mode 100644 index 00000000..416a74f8 Binary files /dev/null and b/share/textures/base/pack/fontdejavusansmono.png differ diff --git a/share/textures/base/pack/fontlucida.png b/share/textures/base/pack/fontlucida.png new file mode 100644 index 00000000..c63fa02b Binary files /dev/null and b/share/textures/base/pack/fontlucida.png differ diff --git a/share/textures/base/pack/menubg.png b/share/textures/base/pack/menubg.png new file mode 100644 index 00000000..7cb9c89a Binary files /dev/null and b/share/textures/base/pack/menubg.png differ diff --git a/share/textures/base/pack/menulogo.png b/share/textures/base/pack/menulogo.png new file mode 100644 index 00000000..76595c48 Binary files /dev/null and b/share/textures/base/pack/menulogo.png differ diff --git a/share/textures/base/pack/smoke_puff.png b/share/textures/base/pack/smoke_puff.png new file mode 100644 index 00000000..e346d204 Binary files /dev/null and b/share/textures/base/pack/smoke_puff.png differ diff --git a/share/textures/base/pack/sunrisebg.png b/share/textures/base/pack/sunrisebg.png new file mode 100644 index 00000000..d8b010eb Binary files /dev/null and b/share/textures/base/pack/sunrisebg.png differ diff --git a/share/textures/base/pack/unknown_block.png b/share/textures/base/pack/unknown_block.png new file mode 100644 index 00000000..a27cb8ca Binary files /dev/null and b/share/textures/base/pack/unknown_block.png differ diff --git a/share/textures/base/pack/unknown_item.png b/share/textures/base/pack/unknown_item.png new file mode 100644 index 00000000..35cabf0a Binary files /dev/null and b/share/textures/base/pack/unknown_item.png differ diff --git a/share/textures/base/pack/unknown_object.png b/share/textures/base/pack/unknown_object.png new file mode 100644 index 00000000..4d6a98d5 Binary files /dev/null and b/share/textures/base/pack/unknown_object.png differ diff --git a/src/tile.cpp b/src/tile.cpp index fc371c94..4af7a327 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -132,9 +132,9 @@ std::string getTexturePath(const std::string &filename) */ if(fullpath == "") { - std::string rel_path = std::string("client") - + DIR_DELIM + "textures" + DIR_DELIM + filename; - std::string testpath = porting::path_share + DIR_DELIM + rel_path; + std::string base_path = porting::path_share + DIR_DELIM + "textures" + + DIR_DELIM + "base" + DIR_DELIM + "pack"; + std::string testpath = base_path + DIR_DELIM + filename; // Check all filename extensions. Returns "" if not found. fullpath = getImagePath(testpath); }