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

master
Perttu Ahola 2011-11-28 20:54:53 +02:00
parent 705f142b8d
commit 026979e39d
5 changed files with 7 additions and 5 deletions

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 582 B

After

Width:  |  Height:  |  Size: 582 B

View File

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 489 B

View File

@ -1021,7 +1021,7 @@ void drawMenuBackground(video::IVideoDriver* driver)
core::dimension2d<u32> screensize = driver->getScreenSize(); core::dimension2d<u32> screensize = driver->getScreenSize();
video::ITexture *bgtexture = video::ITexture *bgtexture =
driver->getTexture(getTexturePath("mud.png").c_str()); driver->getTexture(getTexturePath("menubg.png").c_str());
if(bgtexture) if(bgtexture)
{ {
s32 texturesize = 128; s32 texturesize = 128;

View File

@ -1088,10 +1088,12 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
if(image == NULL) if(image == NULL)
{ {
errorstream<<"generate_image(): Could not load image \"" if(part_of_name != ""){
<<part_of_name<<"\""<<" while building texture"<<std::endl; errorstream<<"generate_image(): Could not load image \""
errorstream<<"generate_image(): Creating a dummy" <<part_of_name<<"\""<<" while building texture"<<std::endl;
<<" image for \""<<part_of_name<<"\""<<std::endl; errorstream<<"generate_image(): Creating a dummy"
<<" image for \""<<part_of_name<<"\""<<std::endl;
}
// Just create a dummy image // Just create a dummy image
//core::dimension2d<u32> dim(2,2); //core::dimension2d<u32> dim(2,2);