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 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 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 all_tex = "brick", + "brown_mushroom", + "coal_ore", "cobblestone", @@ -63,6 +65,8 @@ std::vector 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 0000000..bf33d34 Binary files /dev/null and b/tex/brown_mushroom.png differ diff --git a/tex/red_mushroom.png b/tex/red_mushroom.png new file mode 100755 index 0000000..1b332b7 Binary files /dev/null and b/tex/red_mushroom.png differ