aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/clienttextures/menubg.png (renamed from data/clienttextures/mud.png)bin1586 -> 1586 bytes
-rw-r--r--data/clienttextures/unknown_block.png (renamed from data/mods/default/textures/unknown_block.png)bin582 -> 582 bytes
-rw-r--r--data/clienttextures/unknown_object.png (renamed from data/mods/default/textures/unknown_object.png)bin489 -> 489 bytes
-rw-r--r--src/main.cpp2
-rw-r--r--src/tile.cpp10
5 files changed, 7 insertions, 5 deletions
diff --git a/data/clienttextures/mud.png b/data/clienttextures/menubg.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/data/clienttextures/mud.png
+++ b/data/clienttextures/menubg.png
Binary files differ
diff --git a/data/mods/default/textures/unknown_block.png b/data/clienttextures/unknown_block.png
index a27cb8ca9..a27cb8ca9 100644
--- a/data/mods/default/textures/unknown_block.png
+++ b/data/clienttextures/unknown_block.png
Binary files differ
diff --git a/data/mods/default/textures/unknown_object.png b/data/clienttextures/unknown_object.png
index 4d6a98d56..4d6a98d56 100644
--- a/data/mods/default/textures/unknown_object.png
+++ b/data/clienttextures/unknown_object.png
Binary files differ
diff --git a/src/main.cpp b/src/main.cpp
index 0646494fc..c1b9d902b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1021,7 +1021,7 @@ void drawMenuBackground(video::IVideoDriver* driver)
core::dimension2d<u32> screensize = driver->getScreenSize();
video::ITexture *bgtexture =
- driver->getTexture(getTexturePath("mud.png").c_str());
+ driver->getTexture(getTexturePath("menubg.png").c_str());
if(bgtexture)
{
s32 texturesize = 128;
diff --git a/src/tile.cpp b/src/tile.cpp
index 206d81289..b6abc5427 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1088,10 +1088,12 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
if(image == NULL)
{
- errorstream<<"generate_image(): Could not load image \""
- <<part_of_name<<"\""<<" while building texture"<<std::endl;
- errorstream<<"generate_image(): Creating a dummy"
- <<" image for \""<<part_of_name<<"\""<<std::endl;
+ if(part_of_name != ""){
+ errorstream<<"generate_image(): Could not load image \""
+ <<part_of_name<<"\""<<" while building texture"<<std::endl;
+ errorstream<<"generate_image(): Creating a dummy"
+ <<" image for \""<<part_of_name<<"\""<<std::endl;
+ }
// Just create a dummy image
//core::dimension2d<u32> dim(2,2);