From 4cbf7106300b6c0abb602db1b971e91a4e4e68b1 Mon Sep 17 00:00:00 2001
From: CobaltXII <sidatt64@gmail.com>
Date: Wed, 2 Jan 2019 20:17:28 -0500
Subject: [PATCH] Implemented id_reeds

---
 src/inc/block.hpp |  14 +++++++++++---
 src/inc/face.hpp  |   4 +++-
 src/inc/image.hpp |   2 ++
 tex/reeds.png     | Bin 0 -> 186 bytes
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100755 tex/reeds.png

diff --git a/src/inc/block.hpp b/src/inc/block.hpp
index d885e0f..65a6ad9 100644
--- a/src/inc/block.hpp
+++ b/src/inc/block.hpp
@@ -125,6 +125,8 @@ enum block_id
 
 	id_brick_slab,
 
+	id_reeds,
+
 	id_null
 };
 
@@ -250,7 +252,9 @@ std::vector<std::string> block_id_to_string =
 
 	"cobblestone_slab",
 
-	"brick_slab"
+	"brick_slab",
+
+	"reeds"
 };
 
 // Conversion from block_id to std::string (used for in-game text).
@@ -375,7 +379,9 @@ std::vector<std::string> block_id_to_block_name =
 
 	"Cobblestone Slab",
 
-	"Brick Slab"
+	"Brick Slab",
+
+	"Reeds"
 };
 
 // Returns true if a block is a cross block. Otherwise, returns false.
@@ -390,7 +396,9 @@ inline bool is_cross(block_id id)
 
 		id == id_red_mushroom || 
 
-		id == id_brown_mushroom
+		id == id_brown_mushroom ||
+
+		id == id_reeds
 	)
 	{
 		return true;
diff --git a/src/inc/face.hpp b/src/inc/face.hpp
index 2ba3b93..f27684e 100644
--- a/src/inc/face.hpp
+++ b/src/inc/face.hpp
@@ -186,6 +186,8 @@ void load_block_face_info_array()
 
 		make_face_info_all(block_name_to_layer.at("cobblestone")),
 
-		make_face_info_all(block_name_to_layer.at("brick"))
+		make_face_info_all(block_name_to_layer.at("brick")),
+
+		make_face_info_all(block_name_to_layer.at("reeds"))
 	};
 }
\ No newline at end of file
diff --git a/src/inc/image.hpp b/src/inc/image.hpp
index fc2ce6a..eb0eeca 100644
--- a/src/inc/image.hpp
+++ b/src/inc/image.hpp
@@ -67,6 +67,8 @@ std::vector<std::string> all_tex =
 
 	"red_mushroom",
 
+	"reeds",
+
 	"rose",
 
 	"sand",
diff --git a/tex/reeds.png b/tex/reeds.png
new file mode 100755
index 0000000000000000000000000000000000000000..64bbfe0ecbe99c55c7cf3edb9a3bb89190a6f4b3
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jh-%!Ar-fh6BwG7zt8_Wzs%sR
zJ+sJ~U9q3`XS%9ftYH&S-+Xs&2JZ{8L!v%4`CsJcGcIK}{g=F1z?pF)n~^|~(ym4q
z>4tYMPK`bn*kT%aJ}aHP*d~;w5Uk<Ft`NLp8eamNk~YK62>~-6@S03$RB=~6S=lIJ
jpIj_>^JRlp90NmWN<(Of-Lx*CV;DSL{an^LB{Ts5=KDWb

literal 0
HcmV?d00001