From: Perttu Ahola Date: Tue, 6 Sep 2011 14:13:24 +0000 (+0300) Subject: Fix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactu... X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=b82952bdba27fecb1ac5373c3cb65ef5b41ce466;p=zefram%2Fminetest%2Fminetest_engine.git Fix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactus.png from texture atlas (replace with nothing because cactus is rare) --- diff --git a/data/item_fence.png b/data/item_fence.png deleted file mode 100644 index 76a46187..00000000 Binary files a/data/item_fence.png and /dev/null differ diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 386a5e4e..e18112ae 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -293,7 +293,7 @@ void content_mapnode_init() f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->solidness = 0; // drawn separately, makes no faces f->air_equivalent = true; // grass grows underneath - f->setInventoryTexture("item_fence.png"); + f->setInventoryTexture("fence.png"); setWoodLikeDiggingProperties(f->digging_properties, 0.75); i = CONTENT_RAIL; diff --git a/src/tile.cpp b/src/tile.cpp index c93c0680..d4244bd4 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -524,7 +524,6 @@ void TextureSource::buildMainAtlas() sourcelist.push_back("cobble.png"); sourcelist.push_back("mossycobble.png"); sourcelist.push_back("gravel.png"); - sourcelist.push_back("cactus.png"); sourcelist.push_back("jungletree.png"); sourcelist.push_back("stone.png^mineral_coal.png");