diff options
Diffstat (limited to 'source/BlockID.cpp')
| -rw-r--r-- | source/BlockID.cpp | 66 |
1 files changed, 64 insertions, 2 deletions
diff --git a/source/BlockID.cpp b/source/BlockID.cpp index cb2d16efa..fa84837f4 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -19,6 +19,7 @@ bool g_BlockOneHitDig[256]; bool g_BlockPistonBreakable[256]; bool g_BlockIsSnowable[256]; bool g_BlockRequiresSpecialTool[256]; +bool g_BlockIsSolid[256]; @@ -332,6 +333,7 @@ public: memset(g_BlockPistonBreakable, 0x00, sizeof(g_BlockPistonBreakable)); memset(g_BlockIsSnowable, 0xff, sizeof(g_BlockIsSnowable)); // Set all blocks' snowable to true memset(g_BlockRequiresSpecialTool, 0x00, sizeof(g_BlockRequiresSpecialTool)); // Set all blocks to false + memset(g_BlockIsSolid, 0xff, sizeof(g_BlockIsSolid)); // Emissive blocks g_BlockLightValue[E_BLOCK_FIRE] = 15; @@ -461,7 +463,6 @@ public: g_BlockIsSnowable[E_BLOCK_CHEST] = false; g_BlockIsSnowable[E_BLOCK_CROPS] = false; g_BlockIsSnowable[E_BLOCK_FIRE] = false; - g_BlockIsSnowable[E_BLOCK_FIRE] = false; g_BlockIsSnowable[E_BLOCK_GLASS] = false; g_BlockIsSnowable[E_BLOCK_ICE] = false; g_BlockIsSnowable[E_BLOCK_LAVA] = false; @@ -521,7 +522,68 @@ public: g_BlockRequiresSpecialTool[E_BLOCK_NETHER_BRICK_STAIRS] = true; g_BlockRequiresSpecialTool[E_BLOCK_VINES] = true; - + // Nonsolid Blocks: + g_BlockIsSolid[E_BLOCK_AIR] = false; + g_BlockIsSolid[E_BLOCK_BROWN_MUSHROOM] = false; + g_BlockIsSolid[E_BLOCK_CACTUS] = false; + g_BlockIsSolid[E_BLOCK_CHEST] = false; + g_BlockIsSolid[E_BLOCK_CROPS] = false; + g_BlockIsSolid[E_BLOCK_FIRE] = false; + g_BlockIsSolid[E_BLOCK_GLASS] = false; + g_BlockIsSolid[E_BLOCK_ICE] = false; + g_BlockIsSolid[E_BLOCK_LAVA] = false; + g_BlockIsSolid[E_BLOCK_LOCKED_CHEST] = false; + g_BlockIsSolid[E_BLOCK_REDSTONE_REPEATER_OFF] = false; + g_BlockIsSolid[E_BLOCK_REDSTONE_REPEATER_ON] = false; + g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_OFF] = false; + g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_ON] = false; + g_BlockIsSolid[E_BLOCK_REDSTONE_WIRE] = false; + g_BlockIsSolid[E_BLOCK_RED_MUSHROOM] = false; + g_BlockIsSolid[E_BLOCK_RED_ROSE] = false; + g_BlockIsSolid[E_BLOCK_REEDS] = false; + g_BlockIsSolid[E_BLOCK_SAPLING] = false; + g_BlockIsSolid[E_BLOCK_SIGN_POST] = false; + g_BlockIsSolid[E_BLOCK_SNOW] = false; + g_BlockIsSolid[E_BLOCK_STATIONARY_LAVA] = false; + g_BlockIsSolid[E_BLOCK_STATIONARY_WATER] = false; + g_BlockIsSolid[E_BLOCK_TALL_GRASS] = false; + g_BlockIsSolid[E_BLOCK_TNT] = false; + g_BlockIsSolid[E_BLOCK_TORCH] = false; + g_BlockIsSolid[E_BLOCK_VINES] = false; + g_BlockIsSolid[E_BLOCK_WALLSIGN] = false; + g_BlockIsSolid[E_BLOCK_WATER] = false; + g_BlockIsSolid[E_BLOCK_YELLOW_FLOWER] = false; + g_BlockIsSolid[E_BLOCK_LEAVES] = false; + g_BlockIsSolid[E_BLOCK_PISTON] = false; + g_BlockIsSolid[E_BLOCK_PISTON_EXTENSION] = false; + g_BlockIsSolid[E_BLOCK_FARMLAND] = false; + g_BlockIsSolid[E_BLOCK_STONE_SLAB] = false; + g_BlockIsSolid[E_BLOCK_WOODEN_SLAB] = false; + g_BlockIsSolid[E_BLOCK_COBBLESTONE_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_BRICK_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_STONE_BRICK_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_NETHER_BRICK_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_SANDSTONE_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_SPRUCE_WOOD_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_BIRCH_WOOD_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_JUNGLE_WOOD_STAIRS] = false; + g_BlockIsSolid[E_BLOCK_LADDER] = false; + g_BlockIsSolid[E_BLOCK_FENCE] = false; + g_BlockIsSolid[E_BLOCK_CAKE] = false; + g_BlockIsSolid[E_BLOCK_BED] = false; + g_BlockIsSolid[E_BLOCK_WOODEN_DOOR] = false; + g_BlockIsSolid[E_BLOCK_IRON_DOOR] = false; + g_BlockIsSolid[E_BLOCK_TRAPDOOR] = false; + g_BlockIsSolid[E_BLOCK_RAIL] = false; + g_BlockIsSolid[E_BLOCK_LEVER] = false; + g_BlockIsSolid[E_BLOCK_STONE_PRESSURE_PLATE] = false; + g_BlockIsSolid[E_BLOCK_WOODEN_PRESSURE_PLATE] = false; + g_BlockIsSolid[E_BLOCK_STONE_BUTTON] = false; + g_BlockIsSolid[E_BLOCK_WOODEN_BUTTON] = false; + g_BlockIsSolid[E_BLOCK_ENCHANTMENT_TABLE] = false; + g_BlockIsSolid[E_BLOCK_NETHER_PORTAL] = false; + g_BlockIsSolid[E_BLOCK_END_PORTAL] = false; + g_BlockIsSolid[E_BLOCK_END_PORTAL_FRAME] = false; } } BlockPropertiesInitializer; |