diff options
| -rw-r--r-- | share/textures/base/pack/fontdejavusansmono.png (renamed from share/client/textures/fontdejavusansmono.png) | bin | 9453 -> 9453 bytes | |||
| -rw-r--r-- | share/textures/base/pack/fontlucida.png (renamed from share/client/textures/fontlucida.png) | bin | 17284 -> 17284 bytes | |||
| -rw-r--r-- | share/textures/base/pack/menubg.png (renamed from share/client/textures/menubg.png) | bin | 1586 -> 1586 bytes | |||
| -rw-r--r-- | share/textures/base/pack/menulogo.png (renamed from share/client/textures/menulogo.png) | bin | 498 -> 498 bytes | |||
| -rw-r--r-- | share/textures/base/pack/smoke_puff.png (renamed from share/client/textures/smoke_puff.png) | bin | 2182 -> 2182 bytes | |||
| -rw-r--r-- | share/textures/base/pack/sunrisebg.png (renamed from share/client/textures/sunrisebg.png) | bin | 4652 -> 4652 bytes | |||
| -rw-r--r-- | share/textures/base/pack/unknown_block.png (renamed from share/client/textures/unknown_block.png) | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | share/textures/base/pack/unknown_item.png (renamed from share/client/textures/unknown_item.png) | bin | 710 -> 710 bytes | |||
| -rw-r--r-- | share/textures/base/pack/unknown_object.png (renamed from share/client/textures/unknown_object.png) | bin | 489 -> 489 bytes | |||
| -rw-r--r-- | src/tile.cpp | 6 |
10 files changed, 3 insertions, 3 deletions
diff --git a/share/client/textures/fontdejavusansmono.png b/share/textures/base/pack/fontdejavusansmono.png Binary files differindex 416a74f8a..416a74f8a 100644 --- a/share/client/textures/fontdejavusansmono.png +++ b/share/textures/base/pack/fontdejavusansmono.png diff --git a/share/client/textures/fontlucida.png b/share/textures/base/pack/fontlucida.png Binary files differindex c63fa02b7..c63fa02b7 100644 --- a/share/client/textures/fontlucida.png +++ b/share/textures/base/pack/fontlucida.png diff --git a/share/client/textures/menubg.png b/share/textures/base/pack/menubg.png Binary files differindex 7cb9c89a6..7cb9c89a6 100644 --- a/share/client/textures/menubg.png +++ b/share/textures/base/pack/menubg.png diff --git a/share/client/textures/menulogo.png b/share/textures/base/pack/menulogo.png Binary files differindex 76595c48d..76595c48d 100644 --- a/share/client/textures/menulogo.png +++ b/share/textures/base/pack/menulogo.png diff --git a/share/client/textures/smoke_puff.png b/share/textures/base/pack/smoke_puff.png Binary files differindex e346d204c..e346d204c 100644 --- a/share/client/textures/smoke_puff.png +++ b/share/textures/base/pack/smoke_puff.png diff --git a/share/client/textures/sunrisebg.png b/share/textures/base/pack/sunrisebg.png Binary files differindex d8b010ebb..d8b010ebb 100644 --- a/share/client/textures/sunrisebg.png +++ b/share/textures/base/pack/sunrisebg.png diff --git a/share/client/textures/unknown_block.png b/share/textures/base/pack/unknown_block.png Binary files differindex a27cb8ca9..a27cb8ca9 100644 --- a/share/client/textures/unknown_block.png +++ b/share/textures/base/pack/unknown_block.png diff --git a/share/client/textures/unknown_item.png b/share/textures/base/pack/unknown_item.png Binary files differindex 35cabf0ad..35cabf0ad 100644 --- a/share/client/textures/unknown_item.png +++ b/share/textures/base/pack/unknown_item.png diff --git a/share/client/textures/unknown_object.png b/share/textures/base/pack/unknown_object.png Binary files differindex 4d6a98d56..4d6a98d56 100644 --- a/share/client/textures/unknown_object.png +++ b/share/textures/base/pack/unknown_object.png 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); } |
