From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 28 Nov 2011 18:54:53 +0000 (+0200)
Subject: Rename menu background to menubg.png, move unknown_block.png and unknown_object.png... 
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=026979e39d2eb3a776a16dbc8a0e18c47969b362;p=zefram%2Fminetest%2Fminetest_engine.git

Rename menu background to menubg.png, move unknown_block.png and unknown_object.png to client, make generating a placeholder image for the filename "" not cause an error
---

diff --git a/data/clienttextures/menubg.png b/data/clienttextures/menubg.png
new file mode 100644
index 00000000..7cb9c89a
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
index 7cb9c89a..00000000
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
index 00000000..a27cb8ca
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
index 00000000..4d6a98d5
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
index a27cb8ca..00000000
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
index 4d6a98d5..00000000
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 0646494f..c1b9d902 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 206d8128..b6abc542 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);