summaryrefslogtreecommitdiffstats
path: root/src/BlockInfo.cpp
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2018-01-23 22:07:06 +0100
committerAlexander Harkness <me@bearbin.net>2018-01-23 22:07:06 +0100
commitd3a3c6ad2cafd95363f47f7d370a45425525fa35 (patch)
tree2395ab1c30413a7fc828a3f6da9726f9733d8d18 /src/BlockInfo.cpp
parentFix android build (#4169) (diff)
downloadcuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.tar
cuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.tar.gz
cuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.tar.bz2
cuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.tar.lz
cuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.tar.xz
cuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.tar.zst
cuberite-d3a3c6ad2cafd95363f47f7d370a45425525fa35.zip
Diffstat (limited to 'src/BlockInfo.cpp')
-rw-r--r--src/BlockInfo.cpp88
1 files changed, 3 insertions, 85 deletions
diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
index c2f248a26..eaa41c82b 100644
--- a/src/BlockInfo.cpp
+++ b/src/BlockInfo.cpp
@@ -17,7 +17,8 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
for (size_t i = 0; i < Info.size(); ++i)
{
- Info[i].m_Handler.reset(cBlockHandler::CreateBlockHandler(static_cast<BLOCKTYPE>(i)));
+ Info[i].m_BlockType = static_cast<BLOCKTYPE>(i);
+ Info[i].m_Handler.reset(cBlockHandler::CreateBlockHandler(Info[i].m_BlockType));
}
// Emissive blocks
@@ -313,6 +314,7 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
Info[E_BLOCK_SANDSTONE_STAIRS ].m_Transparent = true;
Info[E_BLOCK_SAPLING ].m_Transparent = true;
Info[E_BLOCK_SIGN_POST ].m_Transparent = true;
+ Info[E_BLOCK_SNOW ].m_Transparent = true;
Info[E_BLOCK_SPRUCE_DOOR ].m_Transparent = true;
Info[E_BLOCK_SPRUCE_FENCE ].m_Transparent = true;
Info[E_BLOCK_SPRUCE_FENCE_GATE ].m_Transparent = true;
@@ -474,90 +476,6 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
Info[E_BLOCK_STANDING_BANNER ].m_IsRainBlocker = true;
- // Blocks that can be snowed over:
- Info[E_BLOCK_BEDROCK ].m_IsSnowable = true;
- Info[E_BLOCK_BLOCK_OF_COAL ].m_IsSnowable = true;
- Info[E_BLOCK_BLOCK_OF_REDSTONE ].m_IsSnowable = true;
- Info[E_BLOCK_BONE_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_BOOKCASE ].m_IsSnowable = true;
- Info[E_BLOCK_BRICK ].m_IsSnowable = true;
- Info[E_BLOCK_CHAIN_COMMAND_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_CLAY ].m_IsSnowable = true;
- Info[E_BLOCK_CRAFTING_TABLE ].m_IsSnowable = true;
- Info[E_BLOCK_COAL_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_COMMAND_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_COBBLESTONE ].m_IsSnowable = true;
- Info[E_BLOCK_DIAMOND_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_DIAMOND_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_DIRT ].m_IsSnowable = true;
- Info[E_BLOCK_DISPENSER ].m_IsSnowable = true;
- Info[E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB ].m_IsSnowable = true;
- Info[E_BLOCK_DOUBLE_STONE_SLAB ].m_IsSnowable = true;
- Info[E_BLOCK_DOUBLE_WOODEN_SLAB ].m_IsSnowable = true;
- Info[E_BLOCK_DROPPER ].m_IsSnowable = true;
- Info[E_BLOCK_EMERALD_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_EMERALD_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_END_BRICKS ].m_IsSnowable = true;
- Info[E_BLOCK_END_STONE ].m_IsSnowable = true;
- Info[E_BLOCK_FURNACE ].m_IsSnowable = true;
- Info[E_BLOCK_GLOWSTONE ].m_IsSnowable = true;
- Info[E_BLOCK_GOLD_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_GOLD_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_GRASS ].m_IsSnowable = true;
- Info[E_BLOCK_GRAVEL ].m_IsSnowable = true;
- Info[E_BLOCK_HARDENED_CLAY ].m_IsSnowable = true;
- Info[E_BLOCK_HAY_BALE ].m_IsSnowable = true;
- Info[E_BLOCK_HUGE_BROWN_MUSHROOM ].m_IsSnowable = true;
- Info[E_BLOCK_HUGE_RED_MUSHROOM ].m_IsSnowable = true;
- Info[E_BLOCK_IRON_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_IRON_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_JACK_O_LANTERN ].m_IsSnowable = true;
- Info[E_BLOCK_JUKEBOX ].m_IsSnowable = true;
- Info[E_BLOCK_LAPIS_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_LAPIS_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_LEAVES ].m_IsSnowable = true;
- Info[E_BLOCK_LIT_FURNACE ].m_IsSnowable = true;
- Info[E_BLOCK_LOG ].m_IsSnowable = true;
- Info[E_BLOCK_MELON ].m_IsSnowable = true;
- Info[E_BLOCK_MOSSY_COBBLESTONE ].m_IsSnowable = true;
- Info[E_BLOCK_MYCELIUM ].m_IsSnowable = true;
- Info[E_BLOCK_NETHER_BRICK ].m_IsSnowable = true;
- Info[E_BLOCK_NETHER_QUARTZ_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_NETHER_WART_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_NETHERRACK ].m_IsSnowable = true;
- Info[E_BLOCK_NEW_LEAVES ].m_IsSnowable = true;
- Info[E_BLOCK_NEW_LOG ].m_IsSnowable = true;
- Info[E_BLOCK_NOTE_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_OBSERVER ].m_IsSnowable = true;
- Info[E_BLOCK_OBSIDIAN ].m_IsSnowable = true;
- Info[E_BLOCK_PLANKS ].m_IsSnowable = true;
- Info[E_BLOCK_PRISMARINE_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_PUMPKIN ].m_IsSnowable = true;
- Info[E_BLOCK_PURPUR_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_PURPUR_DOUBLE_SLAB ].m_IsSnowable = true;
- Info[E_BLOCK_PURPUR_PILLAR ].m_IsSnowable = true;
- Info[E_BLOCK_QUARTZ_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_RED_NETHER_BRICK ].m_IsSnowable = true;
- Info[E_BLOCK_RED_SANDSTONE ].m_IsSnowable = true;
- Info[E_BLOCK_REDSTONE_LAMP_OFF ].m_IsSnowable = true;
- Info[E_BLOCK_REDSTONE_LAMP_ON ].m_IsSnowable = true;
- Info[E_BLOCK_REDSTONE_ORE ].m_IsSnowable = true;
- Info[E_BLOCK_REDSTONE_ORE_GLOWING ].m_IsSnowable = true;
- Info[E_BLOCK_REPEATING_COMMAND_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_SAND ].m_IsSnowable = true;
- Info[E_BLOCK_SANDSTONE ].m_IsSnowable = true;
- Info[E_BLOCK_SEA_LANTERN ].m_IsSnowable = true;
- Info[E_BLOCK_SILVERFISH_EGG ].m_IsSnowable = true;
- Info[E_BLOCK_SNOW_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_SOULSAND ].m_IsSnowable = true;
- Info[E_BLOCK_SPONGE ].m_IsSnowable = true;
- Info[E_BLOCK_STAINED_CLAY ].m_IsSnowable = true;
- Info[E_BLOCK_STONE ].m_IsSnowable = true;
- Info[E_BLOCK_STONE_BRICKS ].m_IsSnowable = true;
- Info[E_BLOCK_STRUCTURE_BLOCK ].m_IsSnowable = true;
- Info[E_BLOCK_TNT ].m_IsSnowable = true;
- Info[E_BLOCK_WOOL ].m_IsSnowable = true;
-
// Nonsolid blocks:
Info[E_BLOCK_ACTIVATOR_RAIL ].m_IsSolid = false;
Info[E_BLOCK_AIR ].m_IsSolid = false;