Move client textures to the correct place

2012-03-19 21:34:21 +02:00 · 2012-03-19 21:34:21 +02:00 · 895b970a10
commit 895b970a10
parent 1f56d71f19
10 changed files with 3 additions and 3 deletions
--- a/share/textures/base/pack/fontdejavusansmono.png
+++ b/share/textures/base/pack/fontdejavusansmono.png
--- a/share/textures/base/pack/fontlucida.png
+++ b/share/textures/base/pack/fontlucida.png
--- a/share/textures/base/pack/menubg.png
+++ b/share/textures/base/pack/menubg.png
--- a/share/textures/base/pack/menulogo.png
+++ b/share/textures/base/pack/menulogo.png
--- a/share/textures/base/pack/smoke_puff.png
+++ b/share/textures/base/pack/smoke_puff.png
--- a/share/textures/base/pack/sunrisebg.png
+++ b/share/textures/base/pack/sunrisebg.png
--- a/share/textures/base/pack/unknown_block.png
+++ b/share/textures/base/pack/unknown_block.png
--- a/share/textures/base/pack/unknown_item.png
+++ b/share/textures/base/pack/unknown_item.png
--- a/share/textures/base/pack/unknown_object.png
+++ b/share/textures/base/pack/unknown_object.png
--- 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")
+		std::string base_path = porting::path_share + DIR_DELIM + "textures"
-				+ DIR_DELIM + "textures" + DIR_DELIM + filename;
+				+ DIR_DELIM + "base" + DIR_DELIM + "pack";
-		std::string testpath = porting::path_share + DIR_DELIM + rel_path;
+		std::string testpath = base_path + DIR_DELIM + filename;
 		// Check all filename extensions. Returns "" if not found.
 		fullpath = getImagePath(testpath);
 	}