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; diff --git a/source/BlockID.h b/source/BlockID.h index 31ae224e3..ea448ecd5 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -666,6 +666,7 @@ extern bool g_BlockOneHitDig[256]; extern bool g_BlockPistonBreakable[256]; extern bool g_BlockIsSnowable[256]; extern bool g_BlockRequiresSpecialTool[256]; +extern bool g_BlockIsSolid[256]; diff --git a/source/Blocks/BlockHandler.h b/source/Blocks/BlockHandler.h index c2884fe7d..1fb93e893 100644 --- a/source/Blocks/BlockHandler.h +++ b/source/Blocks/BlockHandler.h @@ -87,7 +87,7 @@ public: /// Indicates this block can be placed on the side of other blocks. Default: true virtual bool CanBePlacedOnSide(void); - + /// Does this block drop if it gets destroyed by an unsuitable situation? Default: true virtual bool DoesDropOnUnsuitable(void); diff --git a/source/Blocks/BlockLadder.h b/source/Blocks/BlockLadder.h index 92826b721..0b53c4aaf 100644 --- a/source/Blocks/BlockLadder.h +++ b/source/Blocks/BlockLadder.h @@ -21,15 +21,52 @@ public: virtual void PlaceBlock(cWorld * a_World, cPlayer * a_Player, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override { + if (!LadderCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Dir)) + { + a_Dir = FindSuitableDirection(a_World, a_BlockX, a_BlockY, a_BlockZ); + + if (a_Dir == BLOCK_FACE_BOTTOM) + { + return; + } + } + a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, cLadder::DirectionToMetaData(a_Dir)); OnPlacedByPlayer(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_Dir); } + /// Finds a suitable Direction for the Ladder. Returns BLOCK_FACE_BOTTOM on failure + static char FindSuitableDirection(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) + { + for (int i = 2; i <= 5; i++) + { + if (LadderCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, i)) + { + return i; + } + } + return BLOCK_FACE_BOTTOM; + } + + + static bool LadderCanBePlacedAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) + { + if (a_Dir == BLOCK_FACE_BOTTOM || a_Dir == BLOCK_FACE_TOP ) + { + return false; + } + + AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true ); + + return g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ)]; + } + virtual bool CanBePlacedAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override { - AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true ); - return a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ ) != E_BLOCK_AIR; + if (LadderCanBePlacedAt(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Dir)) + return true; + return FindSuitableDirection(a_World, a_BlockX, a_BlockY, a_BlockZ) != BLOCK_FACE_BOTTOM; } diff --git a/source/Blocks/BlockRedstone.h b/source/Blocks/BlockRedstone.h index bb4997e2f..85c993329 100644 --- a/source/Blocks/BlockRedstone.h +++ b/source/Blocks/BlockRedstone.h @@ -27,7 +27,7 @@ public: virtual bool CanBeAt(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override { - return a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ) != E_BLOCK_AIR; + return g_BlockIsSolid[a_World->GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ)]; } diff --git a/source/Blocks/BlockTorch.h b/source/Blocks/BlockTorch.h index 2eb09f3ec..e34bbdd18 100644 --- a/source/Blocks/BlockTorch.h +++ b/source/Blocks/BlockTorch.h @@ -46,59 +46,6 @@ public: { switch (a_BlockType) { - case E_BLOCK_STONE: - case E_BLOCK_GRASS: - case E_BLOCK_DIRT: - case E_BLOCK_COBBLESTONE: - case E_BLOCK_PLANKS: - case E_BLOCK_BEDROCK: - case E_BLOCK_SAND: - case E_BLOCK_GRAVEL: - case E_BLOCK_GOLD_ORE: - case E_BLOCK_IRON_ORE: - case E_BLOCK_COAL_ORE: - case E_BLOCK_LOG: - case E_BLOCK_SPONGE: - case E_BLOCK_LAPIS_ORE: - case E_BLOCK_LAPIS_BLOCK: - case E_BLOCK_SANDSTONE: - case E_BLOCK_WOOL: - case E_BLOCK_GOLD_BLOCK: - case E_BLOCK_IRON_BLOCK: - case E_BLOCK_DOUBLE_STONE_SLAB: - case E_BLOCK_BRICK: - case E_BLOCK_BOOKCASE: - case E_BLOCK_MOSSY_COBBLESTONE: - case E_BLOCK_OBSIDIAN: - case E_BLOCK_MOB_SPAWNER: - case E_BLOCK_DIAMOND_ORE: - case E_BLOCK_DIAMOND_BLOCK: - case E_BLOCK_CRAFTING_TABLE: - case E_BLOCK_REDSTONE_ORE: - case E_BLOCK_REDSTONE_ORE_GLOWING: - case E_BLOCK_SNOW_BLOCK: - case E_BLOCK_CLAY: - case E_BLOCK_JUKEBOX: - case E_BLOCK_PUMPKIN: - case E_BLOCK_NETHERRACK: - case E_BLOCK_SOULSAND: - case E_BLOCK_JACK_O_LANTERN: - case E_BLOCK_LOCKED_CHEST: - case E_BLOCK_STONE_BRICKS: - case E_BLOCK_MELON: - case E_BLOCK_MYCELIUM: - case E_BLOCK_NETHER_BRICK: - case E_BLOCK_END_STONE: - case E_BLOCK_REDSTONE_LAMP_OFF: - case E_BLOCK_REDSTONE_LAMP_ON: - case E_BLOCK_DOUBLE_WOODEN_SLAB: - case E_BLOCK_EMERALD_ORE: - case E_BLOCK_ENDER_CHEST: - case E_BLOCK_EMERALD_BLOCK: - { - return true; - } - case E_BLOCK_GLASS: case E_BLOCK_FENCE: case E_BLOCK_NETHER_BRICK_FENCE: @@ -108,7 +55,7 @@ public: default: { - return false; + return g_BlockIsSolid[a_BlockType]; } } } diff --git a/source/Blocks/BlockVine.h b/source/Blocks/BlockVine.h index 8ad2f4b35..b71997f2a 100644 --- a/source/Blocks/BlockVine.h +++ b/source/Blocks/BlockVine.h @@ -35,20 +35,20 @@ public: return true; } - if ((a_World->GetBlock( a_BlockX, a_BlockY + 1, a_BlockZ ) != E_BLOCK_AIR)) + if (g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY + 1, a_BlockZ )]) { AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true ); - if (a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ ) == E_BLOCK_AIR) + if (g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ )]==false) { AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, false ); - a_World->FastSetBlock( a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_VINES, 0); + a_World->SetBlock( a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_VINES, 0); } return true; } AddDirection( a_BlockX, a_BlockY, a_BlockZ, a_Dir, true ); - return a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ ) != E_BLOCK_AIR; + return g_BlockIsSolid[a_World->GetBlock( a_BlockX, a_BlockY, a_BlockZ)]; }