From 881b302e06cebadcb6af9a3615fa6569c5655fc1 Mon Sep 17 00:00:00 2001 From: CobaltXII Date: Wed, 2 Jan 2019 10:04:13 -0500 Subject: [PATCH] Added id_dandelion and id_rose --- src/inc/block.hpp | 19 ++++++++++++++----- src/inc/face.hpp | 6 +++++- src/inc/image.hpp | 4 ++++ tex/dandelion.png | Bin 0 -> 145 bytes tex/rose.png | Bin 0 -> 2880 bytes 5 files changed, 23 insertions(+), 6 deletions(-) create mode 100755 tex/dandelion.png create mode 100644 tex/rose.png diff --git a/src/inc/block.hpp b/src/inc/block.hpp index 8146826..ad1401f 100644 --- a/src/inc/block.hpp +++ b/src/inc/block.hpp @@ -93,10 +93,7 @@ enum block_id id_glass, - id_null -}; - -// Returns true if the block is not opaque. Otherwise, returns false. + id_rose, inline bool is_transparent(block_id id) { @@ -107,6 +104,7 @@ inline bool is_transparent(block_id id) id == id_oak_leaves || id == id_birch_leaves || + id_dandelion, id == id_water || @@ -120,6 +118,8 @@ inline bool is_transparent(block_id id) return false; } + id_null +}; // Conversion from block_id to std::string. @@ -212,6 +212,10 @@ std::vector block_id_to_string = "black_wool", "glass", + + "rose", + + "dandelion" }; // Conversion from block_id to std::string (used for in-game text). @@ -305,4 +309,9 @@ std::vector block_id_to_block_name = "Black Wool", "Glass" -}; \ No newline at end of file +}; "Glass", + + "Rose", + + "Dandelion" +}; diff --git a/src/inc/face.hpp b/src/inc/face.hpp index 177ce75..53f7421 100644 --- a/src/inc/face.hpp +++ b/src/inc/face.hpp @@ -154,6 +154,10 @@ void load_block_face_info_array() make_face_info_all(block_name_to_layer.at("wool_colored_black")), - make_face_info_all(block_name_to_layer.at("glass")) + make_face_info_all(block_name_to_layer.at("glass")), + + make_face_info_all(block_name_to_layer.at("rose")), + + make_face_info_all(block_name_to_layer.at("dandelion")) }; } \ No newline at end of file diff --git a/src/inc/image.hpp b/src/inc/image.hpp index b93e2b6..6383e5e 100644 --- a/src/inc/image.hpp +++ b/src/inc/image.hpp @@ -23,6 +23,8 @@ std::vector all_tex = "cobblestone", + "dandelion", + "diamond_ore", "dirt", @@ -61,6 +63,8 @@ std::vector all_tex = "oak_planks", + "rose", + "sand", "sandstone_bottom", diff --git a/tex/dandelion.png b/tex/dandelion.png new file mode 100755 index 0000000000000000000000000000000000000000..873e3f5c4719e3a54bd06dd65c60ba4fc689bb63 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`5uPrNAr-fh6C_v{Gq76}&wTm+ z_p|a9``@BDk#esG(c)I$ztaD0e0su1*F-ZUb literal 0 HcmV?d00001 diff --git a/tex/rose.png b/tex/rose.png new file mode 100644 index 0000000000000000000000000000000000000000..1a32cb42b19ce43ad47a757b02ef8ff8e781fe34 GIT binary patch literal 2880 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 e6yon2x&0T`f;V9VYgy0$0000