Rename menu background to menubg.png, move unknown_block.png and unknown_object.png...

diff --git a/data/clienttextures/menubg.png b/data/clienttextures/menubg.png
new file mode 100644 (file)
index 0000000..7cb9c89
Binary files /dev/null and b/data/clienttextures/menubg.png differ

diff --git a/data/clienttextures/mud.png b/data/clienttextures/mud.png
deleted file mode 100644 (file)
index 7cb9c89..0000000
Binary files a/data/clienttextures/mud.png and /dev/null differ

diff --git a/data/clienttextures/unknown_block.png b/data/clienttextures/unknown_block.png
new file mode 100644 (file)
index 0000000..a27cb8c
Binary files /dev/null and b/data/clienttextures/unknown_block.png differ

diff --git a/data/clienttextures/unknown_object.png b/data/clienttextures/unknown_object.png
new file mode 100644 (file)
index 0000000..4d6a98d
Binary files /dev/null and b/data/clienttextures/unknown_object.png differ

diff --git a/data/mods/default/textures/unknown_block.png b/data/mods/default/textures/unknown_block.png
deleted file mode 100644 (file)
index a27cb8c..0000000
Binary files a/data/mods/default/textures/unknown_block.png and /dev/null differ

diff --git a/data/mods/default/textures/unknown_object.png b/data/mods/default/textures/unknown_object.png
deleted file mode 100644 (file)
index 4d6a98d..0000000
Binary files a/data/mods/default/textures/unknown_object.png and /dev/null differ

diff --git a/src/main.cpp b/src/main.cpp
index 0646494fcf51fbcfd4f48059f1c036bc33facb98..c1b9d902b2d61f6199b37f211905f4112c7b5d64 100644 (file)
--- 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 206d81289f14893fc86ff92e4b99fff17357a597..b6abc5427964f6139f43e081a5127d781b8cc7d7 100644 (file)
--- 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);