Fix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactu...

diff --git a/data/item_fence.png b/data/item_fence.png
deleted file mode 100644 (file)
index 76a4618..0000000
Binary files a/data/item_fence.png and /dev/null differ

diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 386a5e4ee6a72c02b2a0e5898ec113105585f2c3..e18112ae4c7c8b7c0ff38321f7ea66974e645f87 100644 (file)
--- 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 c93c0680b42ca838a6c50264a21677a3e65b9d30..d4244bd42045aa475c8ad1095da1ececa7b29b6f 100644 (file)
--- 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");