aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/textures/base/pack/fontdejavusansmono.png (renamed from share/client/textures/fontdejavusansmono.png)bin9453 -> 9453 bytes
-rw-r--r--share/textures/base/pack/fontlucida.png (renamed from share/client/textures/fontlucida.png)bin17284 -> 17284 bytes
-rw-r--r--share/textures/base/pack/menubg.png (renamed from share/client/textures/menubg.png)bin1586 -> 1586 bytes
-rw-r--r--share/textures/base/pack/menulogo.png (renamed from share/client/textures/menulogo.png)bin498 -> 498 bytes
-rw-r--r--share/textures/base/pack/smoke_puff.png (renamed from share/client/textures/smoke_puff.png)bin2182 -> 2182 bytes
-rw-r--r--share/textures/base/pack/sunrisebg.png (renamed from share/client/textures/sunrisebg.png)bin4652 -> 4652 bytes
-rw-r--r--share/textures/base/pack/unknown_block.png (renamed from share/client/textures/unknown_block.png)bin582 -> 582 bytes
-rw-r--r--share/textures/base/pack/unknown_item.png (renamed from share/client/textures/unknown_item.png)bin710 -> 710 bytes
-rw-r--r--share/textures/base/pack/unknown_object.png (renamed from share/client/textures/unknown_object.png)bin489 -> 489 bytes
-rw-r--r--src/tile.cpp6
10 files changed, 3 insertions, 3 deletions
diff --git a/share/client/textures/fontdejavusansmono.png b/share/textures/base/pack/fontdejavusansmono.png
index 416a74f8a..416a74f8a 100644
--- a/share/client/textures/fontdejavusansmono.png
+++ b/share/textures/base/pack/fontdejavusansmono.png
Binary files differ
diff --git a/share/client/textures/fontlucida.png b/share/textures/base/pack/fontlucida.png
index c63fa02b7..c63fa02b7 100644
--- a/share/client/textures/fontlucida.png
+++ b/share/textures/base/pack/fontlucida.png
Binary files differ
diff --git a/share/client/textures/menubg.png b/share/textures/base/pack/menubg.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/share/client/textures/menubg.png
+++ b/share/textures/base/pack/menubg.png
Binary files differ
diff --git a/share/client/textures/menulogo.png b/share/textures/base/pack/menulogo.png
index 76595c48d..76595c48d 100644
--- a/share/client/textures/menulogo.png
+++ b/share/textures/base/pack/menulogo.png
Binary files differ
diff --git a/share/client/textures/smoke_puff.png b/share/textures/base/pack/smoke_puff.png
index e346d204c..e346d204c 100644
--- a/share/client/textures/smoke_puff.png
+++ b/share/textures/base/pack/smoke_puff.png
Binary files differ
diff --git a/share/client/textures/sunrisebg.png b/share/textures/base/pack/sunrisebg.png
index d8b010ebb..d8b010ebb 100644
--- a/share/client/textures/sunrisebg.png
+++ b/share/textures/base/pack/sunrisebg.png
Binary files differ
diff --git a/share/client/textures/unknown_block.png b/share/textures/base/pack/unknown_block.png
index a27cb8ca9..a27cb8ca9 100644
--- a/share/client/textures/unknown_block.png
+++ b/share/textures/base/pack/unknown_block.png
Binary files differ
diff --git a/share/client/textures/unknown_item.png b/share/textures/base/pack/unknown_item.png
index 35cabf0ad..35cabf0ad 100644
--- a/share/client/textures/unknown_item.png
+++ b/share/textures/base/pack/unknown_item.png
Binary files differ
diff --git a/share/client/textures/unknown_object.png b/share/textures/base/pack/unknown_object.png
index 4d6a98d56..4d6a98d56 100644
--- a/share/client/textures/unknown_object.png
+++ b/share/textures/base/pack/unknown_object.png
Binary files differ
diff --git a/src/tile.cpp b/src/tile.cpp
index fc371c941..4af7a3272 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);
}