From 026979e39d2eb3a776a16dbc8a0e18c47969b362 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 28 Nov 2011 20:54:53 +0200
Subject: [PATCH] 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
---
data/clienttextures/{mud.png => menubg.png} | Bin
.../textures => clienttextures}/unknown_block.png | Bin
.../textures => clienttextures}/unknown_object.png | Bin
src/main.cpp | 2 +-
src/tile.cpp | 10 ++++++----
5 files changed, 7 insertions(+), 5 deletions(-)
rename data/clienttextures/{mud.png => menubg.png} (100%)
rename data/{mods/default/textures => clienttextures}/unknown_block.png (100%)
rename data/{mods/default/textures => clienttextures}/unknown_object.png (100%)
diff --git a/data/clienttextures/mud.png b/data/clienttextures/menubg.png
similarity index 100%
rename from data/clienttextures/mud.png
rename to data/clienttextures/menubg.png
diff --git a/data/mods/default/textures/unknown_block.png b/data/clienttextures/unknown_block.png
similarity index 100%
rename from data/mods/default/textures/unknown_block.png
rename to data/clienttextures/unknown_block.png
diff --git a/data/mods/default/textures/unknown_object.png b/data/clienttextures/unknown_object.png
similarity index 100%
rename from data/mods/default/textures/unknown_object.png
rename to 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);
--
GitLab