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: [PATCH] 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)

---
 data/item_fence.png     | Bin 1264 -> 0 bytes
 src/content_mapnode.cpp |   2 +-
 src/tile.cpp            |   1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 data/item_fence.png

diff --git a/data/item_fence.png b/data/item_fence.png
deleted file mode 100644
index 76a4618789c8b7f5bc9d50acd1fb3b14b6f17691..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1264
zcmZuweN5I>6g~)uusKbcRt7P+3)Y(S!5C{S2LtI$280y!VIR6t($0hx8z0S0ghEDU
zr@$!1KeA6TY{<d>sHm2#5SaF{u_NQ1W(AcWwPGOcc3#{Z@OHO*@43I7bD!rt&;9Kw
zD#%+Nb8`#;EXVtEifvyRoXeKjy6@Fz(gDJuD8D4vj(%?Xxy{?j2ZySP2s0BAB0A?3
zKmZtk01&`gRmdk*5CLW&0z`2Cm!zNq!oUQCfX;3TDGP=7BFZd8j7ZLTW+f6twwOo}
z#R5dN)u?(E6&5BYBy{M+3oDZlGCFeXnUqk_u_I5Ymf_H&o2yq{goYyX0g3rKrs;DH
z*0=<b4L?*o??shGtPqJTgH=fcnJp$&yWav-wbl6$_FlZQ3JD{V@nx^1g2L7Zc|{fL
z54~F7!Rm!zrp$ai6Yx5unR^Y@s2K1Ze28+eP&qr!ZzX85XHjB7Vuu7y7ikSfbe`Nm
zqKhh!#S<%%dBEUkVY|UM!d^%j#hgPR>vQ32Kv?LHkpyKB0!#NG3M@cu&sIFJ8U-+*
zxiND4k_dpXBbbv_k}}fEn_6PCR=(&@wRUyoJv8-w?01P5Ble#wFK_Sce>rfnDS6*$
zO=H$82{mv-VIaJEED+f^+T75bR<L2R?ZJ+=iFez_Hf@U=zx7IF*zBdPus;55an6>f
zAKy9K(>F2wntmF0Q|0tOQDJ3MXS>$zy;3xp@@K$)r%L#;uP38&$BM8E=YD$sj^@$r
z@6;#fZ#;bB$V-7+?%s1c@u{L{h<zljeV}n&Q(bRYbpQFhUxrJ1lLwL#o*zoD8M!NE
z)v~m~Y8QR@c)_vRY<Rshs`!)qH{R^{th6VxVcX@*)&q@Ob6T3qHe^6V!soTg&(W5t
zk@e%hSJzZkJyBk@DtGm<ncA;iq{i{jxTd5%KJ~W1S691tHC9KB%uJ6JuWc$gAAO>J
zXT{MAUmQFb!-*Yh8^VWYPM5ZgKDJ}`irO{F4=;To35JG`|9!D;a~~agpt&t#^~t>-
z^X1G#@BLVNDf`CJv|ac7nl!YrwBj2~D^F-C9zK&1zx2`ef!4pua$D{Ud;5bA>-M{e
z-wI3X<2vul+?+jFQrJI!bo;$m|DEdIojQ4{;s;89*6chp-97l$AK#`1{lnaXoR6}f
GZ1@lU&s50(

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");