diff --git a/src/inc/block.hpp b/src/inc/block.hpp index 5109527..9952199 100644 --- a/src/inc/block.hpp +++ b/src/inc/block.hpp @@ -187,6 +187,16 @@ enum block_id id_birch_sapling, + id_fire, + + id_fire_left, + + id_fire_right, + + id_fire_front, + + id_fire_back, + id_null }; @@ -374,7 +384,17 @@ std::vector block_id_to_string = "oak_sapling", - "birch_sapling" + "birch_sapling", + + "fire", + + "fire_left", + + "fire_right", + + "fire_front", + + "fire_back" }; // Conversion from block_id to std::string (used for in-game text). @@ -561,9 +581,42 @@ std::vector block_id_to_block_name = "Oak Sapling", - "Birch Sapling" + "Birch Sapling", + + "Fire", + + "Fire", + + "Fire", + + "Fire", + + "Fire" }; +// Returns true if a block is a fire block. Otherwise, returns false. + +inline bool is_fire(block_id id) +{ + if + ( + id == id_fire || + + id == id_fire_left || + + id == id_fire_right || + + id == id_fire_front || + + id == id_fire_back + ) + { + return true; + } + + return false; +} + // Returns true if a block is a cross block. Otherwise, returns false. inline bool is_cross(block_id id) @@ -691,7 +744,9 @@ inline bool is_transparent(block_id id) is_crop(id) || - is_slab(id) + is_slab(id) || + + is_fire(id) ) { return true; @@ -714,7 +769,9 @@ inline bool is_not_permeable_mob(block_id id) is_cross(id) || - is_crop(id) + is_crop(id) || + + is_fire(id) ) { return false; @@ -754,7 +811,9 @@ inline bool is_not_permeable_light(block_id id) is_cross(id) || - is_crop(id) + is_crop(id) || + + is_fire(id) ) { return false; diff --git a/src/inc/face.hpp b/src/inc/face.hpp index 04f2de9..7dc7b69 100644 --- a/src/inc/face.hpp +++ b/src/inc/face.hpp @@ -227,9 +227,9 @@ void load_block_face_info_array() make_face_info_cap(block_name_to_layer.at("melon_top"), block_name_to_layer.at("melon_side")), - make_face_info_cap(block_name_to_layer.at("farmland_dry"), block_name_to_layer.at("dirt")), + make_face_info_caps(block_name_to_layer.at("farmland_dry"), block_name_to_layer.at("dirt"), block_name_to_layer.at("dirt")), - make_face_info_cap(block_name_to_layer.at("farmland_wet"), block_name_to_layer.at("dirt")), + make_face_info_caps(block_name_to_layer.at("farmland_wet"), block_name_to_layer.at("dirt"), block_name_to_layer.at("dirt")), make_face_info_all(block_name_to_layer.at("wheat_stage_0")), @@ -273,6 +273,16 @@ void load_block_face_info_array() make_face_info_all(block_name_to_layer.at("sapling_oak")), - make_face_info_all(block_name_to_layer.at("sapling_birch")) + make_face_info_all(block_name_to_layer.at("sapling_birch")), + + make_face_info_all(block_name_to_layer.at("fire_0")), + + make_face_info_all(block_name_to_layer.at("fire_0")), + + make_face_info_all(block_name_to_layer.at("fire_0")), + + make_face_info_all(block_name_to_layer.at("fire_0")), + + make_face_info_all(block_name_to_layer.at("fire_0")) }; } \ No newline at end of file