From 895b970a10f5b37a5dec6f668e745c1531fb6ebf Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 19 Mar 2012 21:34:21 +0200 Subject: [PATCH] Move client textures to the correct place --- .../base/pack}/fontdejavusansmono.png | Bin .../textures => textures/base/pack}/fontlucida.png | Bin .../textures => textures/base/pack}/menubg.png | Bin .../textures => textures/base/pack}/menulogo.png | Bin .../textures => textures/base/pack}/smoke_puff.png | Bin .../textures => textures/base/pack}/sunrisebg.png | Bin .../base/pack}/unknown_block.png | Bin .../base/pack}/unknown_item.png | Bin .../base/pack}/unknown_object.png | Bin src/tile.cpp | 6 +++--- 10 files changed, 3 insertions(+), 3 deletions(-) rename share/{client/textures => textures/base/pack}/fontdejavusansmono.png (100%) rename share/{client/textures => textures/base/pack}/fontlucida.png (100%) rename share/{client/textures => textures/base/pack}/menubg.png (100%) rename share/{client/textures => textures/base/pack}/menulogo.png (100%) rename share/{client/textures => textures/base/pack}/smoke_puff.png (100%) rename share/{client/textures => textures/base/pack}/sunrisebg.png (100%) rename share/{client/textures => textures/base/pack}/unknown_block.png (100%) rename share/{client/textures => textures/base/pack}/unknown_item.png (100%) rename share/{client/textures => textures/base/pack}/unknown_object.png (100%) diff --git a/share/client/textures/fontdejavusansmono.png b/share/textures/base/pack/fontdejavusansmono.png similarity index 100% rename from share/client/textures/fontdejavusansmono.png rename to share/textures/base/pack/fontdejavusansmono.png diff --git a/share/client/textures/fontlucida.png b/share/textures/base/pack/fontlucida.png similarity index 100% rename from share/client/textures/fontlucida.png rename to share/textures/base/pack/fontlucida.png diff --git a/share/client/textures/menubg.png b/share/textures/base/pack/menubg.png similarity index 100% rename from share/client/textures/menubg.png rename to share/textures/base/pack/menubg.png diff --git a/share/client/textures/menulogo.png b/share/textures/base/pack/menulogo.png similarity index 100% rename from share/client/textures/menulogo.png rename to share/textures/base/pack/menulogo.png diff --git a/share/client/textures/smoke_puff.png b/share/textures/base/pack/smoke_puff.png similarity index 100% rename from share/client/textures/smoke_puff.png rename to share/textures/base/pack/smoke_puff.png diff --git a/share/client/textures/sunrisebg.png b/share/textures/base/pack/sunrisebg.png similarity index 100% rename from share/client/textures/sunrisebg.png rename to share/textures/base/pack/sunrisebg.png diff --git a/share/client/textures/unknown_block.png b/share/textures/base/pack/unknown_block.png similarity index 100% rename from share/client/textures/unknown_block.png rename to share/textures/base/pack/unknown_block.png diff --git a/share/client/textures/unknown_item.png b/share/textures/base/pack/unknown_item.png similarity index 100% rename from share/client/textures/unknown_item.png rename to share/textures/base/pack/unknown_item.png diff --git a/share/client/textures/unknown_object.png b/share/textures/base/pack/unknown_object.png similarity index 100% rename from share/client/textures/unknown_object.png rename to share/textures/base/pack/unknown_object.png 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); } -- 2.30.2