From ec7bfb26e8bfb7dcf452becde4e838281b2bebc3 Mon Sep 17 00:00:00 2001
From: CobaltXII <sidatt64@gmail.com>
Date: Wed, 2 Jan 2019 16:25:40 -0500
Subject: [PATCH] Added id_red_mushroom and id_brown_mushroom

---
 src/inc/block.hpp      |  22 +++++++++++++++++++---
 src/inc/face.hpp       |   6 +++++-
 src/inc/image.hpp      |   4 ++++
 tex/brown_mushroom.png | Bin 0 -> 120 bytes
 tex/red_mushroom.png   | Bin 0 -> 143 bytes
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100755 tex/brown_mushroom.png
 create mode 100755 tex/red_mushroom.png

diff --git a/src/inc/block.hpp b/src/inc/block.hpp
index c906da8..b26ecd5 100644
--- a/src/inc/block.hpp
+++ b/src/inc/block.hpp
@@ -97,6 +97,10 @@ enum block_id
 
 	id_dandelion,
 
+	id_red_mushroom,
+
+	id_brown_mushroom,
+
 	id_null
 };
 
@@ -194,7 +198,11 @@ std::vector<std::string> block_id_to_string =
 
 	"rose",
 
-	"dandelion"
+	"dandelion",
+
+	"red_mushroom",
+
+	"brown_mushroom"
 };
 
 // Conversion from block_id to std::string (used for in-game text).
@@ -291,7 +299,11 @@ std::vector<std::string> block_id_to_block_name =
 
 	"Rose",
 
-	"Dandelion"
+	"Dandelion",
+
+	"Red Mushroom",
+
+	"Brown Mushroom"
 };
 
 // Returns true if a block is a cross block. Otherwise, returns false.
@@ -302,7 +314,11 @@ inline bool is_cross(block_id id)
 	(
 		id == id_rose ||
 
-		id == id_dandelion
+		id == id_dandelion ||
+
+		id == id_red_mushroom || 
+
+		id == id_brown_mushroom
 	)
 	{
 		return true;
diff --git a/src/inc/face.hpp b/src/inc/face.hpp
index 53f7421..c32ef00 100644
--- a/src/inc/face.hpp
+++ b/src/inc/face.hpp
@@ -158,6 +158,10 @@ void load_block_face_info_array()
 
 		make_face_info_all(block_name_to_layer.at("rose")),
 
-		make_face_info_all(block_name_to_layer.at("dandelion"))
+		make_face_info_all(block_name_to_layer.at("dandelion")),
+
+		make_face_info_all(block_name_to_layer.at("red_mushroom")),
+
+		make_face_info_all(block_name_to_layer.at("brown_mushroom"))
 	};
 }
\ No newline at end of file
diff --git a/src/inc/image.hpp b/src/inc/image.hpp
index 6383e5e..71dcd67 100644
--- a/src/inc/image.hpp
+++ b/src/inc/image.hpp
@@ -19,6 +19,8 @@ std::vector<std::string> all_tex =
 
 	"brick",
 
+	"brown_mushroom",
+
 	"coal_ore",
 
 	"cobblestone",
@@ -63,6 +65,8 @@ std::vector<std::string> all_tex =
 
 	"oak_planks",
 
+	"red_mushroom",
+
 	"rose",
 
 	"sand",
diff --git a/tex/brown_mushroom.png b/tex/brown_mushroom.png
new file mode 100755
index 0000000000000000000000000000000000000000..bf33d3482864a075fee7238e367c237a65a7d71f
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`_MR?|Ar-fh6C_v{Cj>Mb8*BeN
z{Nc!*3;$Cx*)m%mE;2}e#OrvC<Fd~tMg!jyGoBQj=-~VH{$;|~`EMFjjxjLYx^JzW
TfAz93&?p8^S3j3^P6<r_!@n#z

literal 0
HcmV?d00001

diff --git a/tex/red_mushroom.png b/tex/red_mushroom.png
new file mode 100755
index 0000000000000000000000000000000000000000..1b332b796c94dd54ba71e58cd37af669e0bf3ca2
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`VV*9IAr-fh6C_v{Cj>OtM@9Wl
z{4sIDh5AXR%?uvO9P$%Gf7^S<JhQ(zD^V)($DN(U3CtZvEK4NPv^#h=%eE}{o$WS9
qdxEKA@+9U>#}2-%-?2_Fu9rcp)~i@QLi+*G1_n=8KbLh*2~7Yq+%Vw)

literal 0
HcmV?d00001