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 (file)
index 416a74f..0000000
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 (file)
index c63fa02..0000000
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 (file)
index 7cb9c89..0000000
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 (file)
index 76595c4..0000000
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 (file)
index e346d20..0000000
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 (file)
index d8b010e..0000000
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 (file)
index a27cb8c..0000000
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 (file)
index 35cabf0..0000000
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 (file)
index 4d6a98d..0000000
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 (file)
index 0000000..416a74f
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 (file)
index 0000000..c63fa02
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 (file)
index 0000000..7cb9c89
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 (file)
index 0000000..76595c4
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 (file)
index 0000000..e346d20
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 (file)
index 0000000..d8b010e
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 (file)
index 0000000..a27cb8c
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 (file)
index 0000000..35cabf0
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 (file)
index 0000000..4d6a98d
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 fc371c9417ae16c949a462afa03de283c079fbeb..4af7a327273d0059ad32aecdff3416836f6d2132 100644 (file)
--- 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);
        }