From 480991d1ac07c1715bf090a4d81e988a00803cf3 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 18 Sep 2013 00:01:20 +0100 Subject: Multiple fixes [SEE DESC] - Removed two random block handling files in the item handling section that didn't do anything. (One was an attempt at making slabs work, but failed to realise that the coords would have to be the block CLICKED, and another was just a random empty file for handling wooden planks.) * Fixed placing repeater blocks not directioning properly * Fixed wood directions breaking plank metadata --- source/Blocks/BlockRedstoneRepeater.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'source/Blocks/BlockRedstoneRepeater.cpp') diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 3bc879435..5e491ee5a 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -4,6 +4,7 @@ #include "../Item.h" #include "../World.h" #include "../Simulator/RedstoneSimulator.h" +#include "../Entities/Player.h" @@ -44,3 +45,18 @@ void cBlockRedstoneRepeaterHandler::OnDigging(cWorld *a_World, cPlayer *a_Player +bool cBlockRedstoneRepeaterHandler::GetPlacementBlockTypeMeta( + cWorld * a_World, cPlayer * a_Player, + int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, + int a_CursorX, int a_CursorY, int a_CursorZ, + BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta +) +{ + a_BlockType = m_BlockType; + a_BlockMeta = cRedstoneSimulator::RepeaterRotationToMetaData(a_Player->GetRotation()); + return true; +} + + + + -- cgit v1.2.3 From 9d46fa6ae9718f51f9031111c4f28ffd7e6ecc0f Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 18:18:04 +0100 Subject: Changed to SetBlockMeta --- source/Blocks/BlockRedstoneRepeater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/Blocks/BlockRedstoneRepeater.cpp') diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 5e491ee5a..8cfb48f4d 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -30,7 +30,7 @@ void cBlockRedstoneRepeaterHandler::OnDestroyed(cWorld *a_World, int a_BlockX, i void cBlockRedstoneRepeaterHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) { - a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f)); + a_World->SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f)); } -- cgit v1.2.3 From 5c22a9f5f0e1e072eb9034a79e3bfc465822deab Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 19:16:56 +0100 Subject: Removed OnDigging for Redstone devices --- source/Blocks/BlockRedstoneRepeater.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'source/Blocks/BlockRedstoneRepeater.cpp') diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 8cfb48f4d..672fdf55a 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -36,15 +36,6 @@ void cBlockRedstoneRepeaterHandler::OnUse(cWorld *a_World, cPlayer *a_Player, in - -void cBlockRedstoneRepeaterHandler::OnDigging(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) -{ - OnUse(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, BLOCK_FACE_NONE, 8, 8, 8); -} - - - - bool cBlockRedstoneRepeaterHandler::GetPlacementBlockTypeMeta( cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, -- cgit v1.2.3 From dad3648102c5861ed691ac90bd265bcc5667e787 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sun, 22 Sep 2013 19:48:59 +0100 Subject: Removed some unneeded includes --- source/Blocks/BlockRedstoneRepeater.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'source/Blocks/BlockRedstoneRepeater.cpp') diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 672fdf55a..72ea21012 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -1,8 +1,6 @@ #include "Globals.h" #include "BlockRedstoneRepeater.h" -#include "../Item.h" -#include "../World.h" #include "../Simulator/RedstoneSimulator.h" #include "../Entities/Player.h" -- cgit v1.2.3