aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-09-06 17:13:24 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-09-06 17:13:24 +0300
commitb82952bdba27fecb1ac5373c3cb65ef5b41ce466 (patch)
tree222cc0c15cff8a6726d8c5358fce1e76e86b8fa0
parent570a8dbf22e8e33fed22292941edfaa38d41c289 (diff)
downloadminetest-b82952bdba27fecb1ac5373c3cb65ef5b41ce466.tar.gz
minetest-b82952bdba27fecb1ac5373c3cb65ef5b41ce466.tar.bz2
minetest-b82952bdba27fecb1ac5373c3cb65ef5b41ce466.zip
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)
-rw-r--r--data/item_fence.pngbin1264 -> 0 bytes
-rw-r--r--src/content_mapnode.cpp2
-rw-r--r--src/tile.cpp1
3 files changed, 1 insertions, 2 deletions
diff --git a/data/item_fence.png b/data/item_fence.png
deleted file mode 100644
index 76a461878..000000000
--- a/data/item_fence.png
+++ /dev/null
Binary files differ
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 386a5e4ee..e18112ae4 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 c93c0680b..d4244bd42 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");