diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-28 20:54:53 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:57 +0200 |
| commit | 026979e39d2eb3a776a16dbc8a0e18c47969b362 (patch) | |
| tree | 0507ff11e161f52cb7cbfee3524096862388d1fc | |
| parent | 705f142b8d53c22aac4f023d12db6fef010d4d9e (diff) | |
| download | minetest-026979e39d2eb3a776a16dbc8a0e18c47969b362.tar.gz minetest-026979e39d2eb3a776a16dbc8a0e18c47969b362.tar.bz2 minetest-026979e39d2eb3a776a16dbc8a0e18c47969b362.zip | |
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
| -rw-r--r-- | data/clienttextures/menubg.png (renamed from data/clienttextures/mud.png) | bin | 1586 -> 1586 bytes | |||
| -rw-r--r-- | data/clienttextures/unknown_block.png (renamed from data/mods/default/textures/unknown_block.png) | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | data/clienttextures/unknown_object.png (renamed from data/mods/default/textures/unknown_object.png) | bin | 489 -> 489 bytes | |||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/tile.cpp | 10 |
5 files changed, 7 insertions, 5 deletions
diff --git a/data/clienttextures/mud.png b/data/clienttextures/menubg.png Binary files differindex 7cb9c89a6..7cb9c89a6 100644 --- a/data/clienttextures/mud.png +++ b/data/clienttextures/menubg.png diff --git a/data/mods/default/textures/unknown_block.png b/data/clienttextures/unknown_block.png Binary files differindex a27cb8ca9..a27cb8ca9 100644 --- a/data/mods/default/textures/unknown_block.png +++ b/data/clienttextures/unknown_block.png diff --git a/data/mods/default/textures/unknown_object.png b/data/clienttextures/unknown_object.png Binary files differindex 4d6a98d56..4d6a98d56 100644 --- a/data/mods/default/textures/unknown_object.png +++ b/data/clienttextures/unknown_object.png 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); |
