From b82952bdba27fecb1ac5373c3cb65ef5b41ce466 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Tue, 6 Sep 2011 17:13:24 +0300
Subject: 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)

---
 src/content_mapnode.cpp | 2 +-
 src/tile.cpp            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

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");
-- 
cgit v1.2.3