Added id_red_mushroom and id_brown_mushroom

This commit is contained in:
CobaltXII
2019-01-02 16:25:40 -05:00
parent 57f217dc81
commit ec7bfb26e8
5 changed files with 28 additions and 4 deletions

View File

@@ -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;

View File

@@ -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"))
};
}

View File

@@ -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",

BIN
tex/brown_mushroom.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

BIN
tex/red_mushroom.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B