From 28332c656712cc692ca8355a4f5e8c0c5012c60c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 6 Oct 2012 20:04:58 +0000 Subject: Completely removed the old (buggy) redstone simulator. git-svn-id: http://mc-server.googlecode.com/svn/trunk@937 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Blocks/BlockRedstoneRepeater.cpp | 41 +++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'source/Blocks/BlockRedstoneRepeater.cpp') diff --git a/source/Blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp index 797c8c4d2..5af5edb1e 100644 --- a/source/Blocks/BlockRedstoneRepeater.cpp +++ b/source/Blocks/BlockRedstoneRepeater.cpp @@ -1,39 +1,66 @@ + #include "Globals.h" #include "BlockRedstoneRepeater.h" #include "../Item.h" #include "../World.h" -#include "../Redstone.h" #include "../Player.h" +#include "../RedstoneSimulator.h" + + + + cBlockRedstoneRepeaterHandler::cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType) : cBlockHandler(a_BlockType) { } + + + + void cBlockRedstoneRepeaterHandler::OnPlaced(cWorld *a_World, int a_BlockX, int a_BlockY, int a_BlockZ, int a_Dir) { - cRedstone Redstone(a_World); - Redstone.ChangeRedstone(a_BlockX, a_BlockY, a_BlockZ, false); + // Noting needed yet } + + + + void cBlockRedstoneRepeaterHandler::OnDestroyed(cWorld *a_World, int a_BlockX, int a_BlockY, int a_BlockZ) { - cRedstone Redstone(a_World); - Redstone.ChangeRedstone(a_BlockX, a_BlockY, a_BlockZ, false); + // Nothing needed yet } + + + + void cBlockRedstoneRepeaterHandler::OnUse(cWorld *a_World, cPlayer *a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) { a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, ((a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) + 0x04) & 0x0f)); } + + + + 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); } + + + + void cBlockRedstoneRepeaterHandler::PlaceBlock(cWorld *a_World, cPlayer *a_Player, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) { - a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, cRedstone::RepeaterRotationToMetaData(a_Player->GetRotation())); + a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, m_BlockType, cRedstoneSimulator::RepeaterRotationToMetaData(a_Player->GetRotation())); OnPlacedByPlayer(a_World, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_Dir); -} \ No newline at end of file +} + + + + -- cgit v1.2.3