diff options
| -rw-r--r-- | source/cBlockToPickup.cpp | 3 | ||||
| -rw-r--r-- | source/cRedstone.h | 87 | ||||
| -rw-r--r-- | source/cRedstoneSimulator.cpp | 272 | ||||
| -rw-r--r-- | source/cRedstoneSimulator.h | 42 |
4 files changed, 355 insertions, 49 deletions
diff --git a/source/cBlockToPickup.cpp b/source/cBlockToPickup.cpp index c6d9e732f..73d44afee 100644 --- a/source/cBlockToPickup.cpp +++ b/source/cBlockToPickup.cpp @@ -69,6 +69,9 @@ ENUM_ITEM_ID cBlockToPickup::ToPickup( unsigned char a_BlockID, ENUM_ITEM_ID a_U return E_ITEM_GLOWSTONE_DUST;
case E_BLOCK_DOUBLE_STEP:
return E_ITEM_STEP;
+ case E_BLOCK_REDSTONE_REPEATER_OFF:
+ case E_BLOCK_REDSTONE_REPEATER_ON:
+ return E_ITEM_REDSTONE_REPEATER;
default:
return (ENUM_ITEM_ID)a_BlockID;
}
diff --git a/source/cRedstone.h b/source/cRedstone.h index 44641fbdf..26e9a6319 100644 --- a/source/cRedstone.h +++ b/source/cRedstone.h @@ -1,5 +1,7 @@ #pragma once
+#include "Vector3i.h"
+
class cWorld;
class cRedstone
{
@@ -21,6 +23,91 @@ public: return 0x0;
}
+ static bool IsRepeaterPointingTo( const Vector3i & a_RepeaterPos, char a_MetaData, const Vector3i & a_BlockPos )
+ {
+ switch( a_MetaData )
+ {
+ case 0x0:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i( 0, 0, 1 ) ) )
+ {
+ return true;
+ }
+ break;
+ case 0x1:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i(-1, 0, 0 ) ) )
+ {
+ return true;
+ }
+ break;
+ case 0x2:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i( 0, 0,-1 ) ) )
+ {
+ return true;
+ }
+ break;
+ case 0x3:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i( 1, 0, 0 ) ) )
+ {
+ return true;
+ }
+ break;
+ default:
+ break;
+ }
+ return false;
+ }
+
+ static bool IsRepeaterPointingAway( const Vector3i & a_RepeaterPos, char a_MetaData, const Vector3i & a_BlockPos )
+ {
+ switch( a_MetaData )
+ {
+ case 0x0:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i( 0, 0,-1 ) ) )
+ {
+ return true;
+ }
+ break;
+ case 0x1:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i( 1, 0, 0 ) ) )
+ {
+ return true;
+ }
+ break;
+ case 0x2:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i( 0, 0, 1 ) ) )
+ {
+ return true;
+ }
+ break;
+ case 0x3:
+ if( (a_RepeaterPos - a_BlockPos).Equals( Vector3i(-1, 0, 0 ) ) )
+ {
+ return true;
+ }
+ break;
+ default:
+ break;
+ }
+ return false;
+ }
+
+ static Vector3i GetRepeaterDirection( char a_MetaData )
+ {
+ switch( a_MetaData )
+ {
+ case 0x0:
+ return Vector3i( 0, 0,-1 );
+ case 0x1:
+ return Vector3i( 1, 0, 0 );
+ case 0x2:
+ return Vector3i( 0, 0, 1 );
+ case 0x3:
+ return Vector3i(-1, 0, 0 );
+ default:
+ break;
+ }
+ return Vector3i();
+ }
void CalculateRedstone( int, int, int );
void ChangeRedstone( int, int, int, bool );
diff --git a/source/cRedstoneSimulator.cpp b/source/cRedstoneSimulator.cpp index f60978da6..be93c6338 100644 --- a/source/cRedstoneSimulator.cpp +++ b/source/cRedstoneSimulator.cpp @@ -47,12 +47,48 @@ void cRedstoneSimulator::Simulate( float a_Dt ) // Toggle torches on/off
while( !m_RefreshTorchesAround.empty() )
{
- Vector3i pos = m_RefreshTorchesAround.back();
- m_RefreshTorchesAround.pop_back();
+ Vector3i pos = m_RefreshTorchesAround.front();
+ m_RefreshTorchesAround.pop_front();
RefreshTorchesAround( pos );
}
+ // Set repeaters to correct values, and decrement ticks
+ for( RepeaterList::iterator itr = m_SetRepeaters.begin(); itr != m_SetRepeaters.end(); )
+ {
+ (*itr).Ticks--;
+ if( (*itr).Ticks <= 0 )
+ {
+ char Block = m_World->GetBlock( (*itr).Position );
+ if( (*itr).bPowerOn == true && Block == E_BLOCK_REDSTONE_REPEATER_OFF )
+ {
+ m_World->FastSetBlock( (*itr).Position.x, (*itr).Position.y, (*itr).Position.z, E_BLOCK_REDSTONE_REPEATER_ON, m_World->GetBlockMeta( (*itr).Position ) );
+ m_Blocks.push_back( (*itr).Position );
+ }
+ else if( (*itr).bPowerOn == false && Block == E_BLOCK_REDSTONE_REPEATER_ON )
+ {
+ m_World->FastSetBlock( (*itr).Position.x, (*itr).Position.y, (*itr).Position.z, E_BLOCK_REDSTONE_REPEATER_OFF, m_World->GetBlockMeta( (*itr).Position ) );
+ m_Blocks.push_back( (*itr).Position );
+ }
+
+ if( (*itr).bPowerOffNextTime )
+ {
+ (*itr).bPowerOn = false;
+ (*itr).bPowerOffNextTime = false;
+ (*itr).Ticks = 10; // TODO: Look up actual ticks from block metadata
+ ++itr;
+ }
+ else
+ {
+ itr = m_SetRepeaters.erase( itr );
+ }
+ }
+ else
+ {
+ ++itr;
+ }
+ }
+
// Handle changed blocks
{
cCSLock Lock( m_CS );
@@ -79,9 +115,11 @@ void cRedstoneSimulator::RefreshTorchesAround( const Vector3i & a_BlockPos ) Vector3i( 0, 1, 0), // Also toggle torch on top
};
char TargetBlockID = E_BLOCK_REDSTONE_TORCH_ON;
+ char TargetRepeaterID = E_BLOCK_REDSTONE_REPEATER_OFF;
if( IsPowered( a_BlockPos, true ) )
{
TargetBlockID = E_BLOCK_REDSTONE_TORCH_OFF;
+ TargetRepeaterID = E_BLOCK_REDSTONE_REPEATER_ON;
//if( m_World->GetBlock( a_BlockPos ) == E_BLOCK_DIRT )
//{
// m_World->FastSetBlock( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z, E_BLOCK_STONE, 0 );
@@ -99,8 +137,10 @@ void cRedstoneSimulator::RefreshTorchesAround( const Vector3i & a_BlockPos ) {
Vector3i TorchPos = a_BlockPos + Surroundings[i];
const char Block = m_World->GetBlock( TorchPos );
- if( Block == E_BLOCK_REDSTONE_TORCH_ON || Block == E_BLOCK_REDSTONE_TORCH_OFF )
+ switch( Block )
{
+ case E_BLOCK_REDSTONE_TORCH_ON:
+ case E_BLOCK_REDSTONE_TORCH_OFF:
if( Block != TargetBlockID )
{
char TorchMeta = m_World->GetBlockMeta( TorchPos );
@@ -110,7 +150,17 @@ void cRedstoneSimulator::RefreshTorchesAround( const Vector3i & a_BlockPos ) m_Blocks.push_back( TorchPos );
}
}
- }
+ break;
+ case E_BLOCK_REDSTONE_REPEATER_ON:
+ case E_BLOCK_REDSTONE_REPEATER_OFF:
+ if( Block != TargetRepeaterID && cRedstone::IsRepeaterPointingAway( TorchPos, m_World->GetBlockMeta( TorchPos ), a_BlockPos ) )
+ {
+ SetRepeater( TorchPos, 10, TargetRepeaterID == E_BLOCK_REDSTONE_REPEATER_ON );
+ }
+ break;
+ default:
+ break;
+ };
}
}
@@ -161,6 +211,21 @@ void cRedstoneSimulator::HandleChange( const Vector3i & a_BlockPos ) }
Block = m_World->GetBlock( a_BlockPos ); // Make sure we got the updated block
}
+ else if( Block == E_BLOCK_REDSTONE_REPEATER_ON || Block == E_BLOCK_REDSTONE_REPEATER_OFF ) // Check if repeater is powered by a 'powered block' (not wires/torch)
+ {
+ Vector3i Direction = cRedstone::GetRepeaterDirection( m_World->GetBlockMeta( a_BlockPos ) );
+ Vector3i pos = a_BlockPos - Direction; // NOTE: It's minus Direction
+ char OtherBlock = m_World->GetBlock( pos );
+ if( (OtherBlock != E_BLOCK_AIR) && (OtherBlock != E_BLOCK_REDSTONE_TORCH_ON) && (OtherBlock != E_BLOCK_REDSTONE_TORCH_OFF) && (OtherBlock != E_BLOCK_REDSTONE_WIRE) )
+ {
+ RefreshTorchesAround( pos );
+ }
+ else
+ {
+ SetRepeater( a_BlockPos, 10, IsPowered( a_BlockPos, false ) );
+ }
+ Block = m_World->GetBlock( a_BlockPos );
+ }
BlockList Sources;
// If torch is still on, use it as a source
@@ -168,30 +233,76 @@ void cRedstoneSimulator::HandleChange( const Vector3i & a_BlockPos ) {
Sources.push_back( a_BlockPos );
}
+ else if( Block == E_BLOCK_REDSTONE_REPEATER_ON )
+ {
+ static Vector3i Surroundings [] = { // It only spreads right in front, and one block up
+ Vector3i( 0, 0, 0),
+ Vector3i( 0, 1, 0),
+ };
+ Vector3i Direction = cRedstone::GetRepeaterDirection( m_World->GetBlockMeta( a_BlockPos ) );
+ for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
+ {
+ Vector3i pos = a_BlockPos + Direction + Surroundings[i];
+ if( PowerBlock( pos, a_BlockPos, 0xf ) )
+ {
+ SpreadStack.push_back( pos );
+ }
+ }
+ }
// Power all blocks legally connected to the sources
+ if( Block != E_BLOCK_REDSTONE_REPEATER_ON )
{
BlockList NewSources = RemoveCurrent( a_BlockPos );
Sources.insert( Sources.end(), NewSources.begin(), NewSources.end() );
while( !Sources.empty() )
{
- static Vector3i Surroundings [] = {
- Vector3i(-1, 0, 0),
- Vector3i( 1, 0, 0),
- Vector3i( 0, 0,-1),
- Vector3i( 0, 0, 1),
- };
-
Vector3i SourcePos = Sources.back();
- for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
+ Sources.pop_back();
+
+ char Block = m_World->GetBlock( SourcePos );
+ switch( Block )
{
- Vector3i OtherPos = SourcePos + Surroundings[i];
- if( PowerBlock( OtherPos, a_BlockPos, 0xf ) )
+ case E_BLOCK_REDSTONE_TORCH_OFF:
+ case E_BLOCK_REDSTONE_TORCH_ON:
{
- SpreadStack.push_back( OtherPos ); // Changed, so add to stack
+ static Vector3i Surroundings [] = {
+ Vector3i(-1, 0, 0),
+ Vector3i( 1, 0, 0),
+ Vector3i( 0, 0,-1),
+ Vector3i( 0, 0, 1),
+ };
+ for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
+ {
+ Vector3i OtherPos = SourcePos + Surroundings[i];
+ if( PowerBlock( OtherPos, a_BlockPos, 0xf ) )
+ {
+ SpreadStack.push_back( OtherPos ); // Changed, so add to stack
+ }
+ }
}
- }
- Sources.pop_back();
+ break;
+ case E_BLOCK_REDSTONE_REPEATER_OFF:
+ case E_BLOCK_REDSTONE_REPEATER_ON:
+ {
+ static Vector3i Surroundings [] = {
+ Vector3i( 0, 0, 0),
+ Vector3i( 0, 1, 0),
+ };
+ Vector3i Direction = cRedstone::GetRepeaterDirection( m_World->GetBlockMeta( SourcePos ) );
+ for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
+ {
+ Vector3i pos = SourcePos + Direction + Surroundings[i];
+ if( PowerBlock( pos, a_BlockPos, 0xf ) )
+ {
+ SpreadStack.push_back( pos );
+ }
+ }
+ }
+ break;
+ };
+
+
}
}
@@ -264,6 +375,15 @@ bool cRedstoneSimulator::PowerBlock( const Vector3i & a_BlockPos, const Vector3i m_RefreshPistons.push_back( a_BlockPos );
}
break;
+ case E_BLOCK_REDSTONE_REPEATER_OFF:
+ case E_BLOCK_REDSTONE_REPEATER_ON:
+ {
+ if( cRedstone::IsRepeaterPointingAway( a_BlockPos, m_World->GetBlockMeta( a_BlockPos ), a_FromBlock ) )
+ {
+ SetRepeater( a_BlockPos, 10, true );
+ }
+ }
+ break;
default:
{
if( Block != E_BLOCK_AIR && Block != E_BLOCK_REDSTONE_TORCH_ON && Block != E_BLOCK_REDSTONE_TORCH_OFF )
@@ -284,7 +404,7 @@ bool cRedstoneSimulator::PowerBlock( const Vector3i & a_BlockPos, const Vector3i -int cRedstoneSimulator::UnPowerBlock( const Vector3i & a_BlockPos )
+int cRedstoneSimulator::UnPowerBlock( const Vector3i & a_BlockPos, const Vector3i & a_FromBlock )
{
char Block = m_World->GetBlock( a_BlockPos );
switch( Block )
@@ -308,6 +428,24 @@ int cRedstoneSimulator::UnPowerBlock( const Vector3i & a_BlockPos ) return 2;
}
break;
+ case E_BLOCK_REDSTONE_REPEATER_ON:
+ {
+ if( cRedstone::IsRepeaterPointingTo( a_BlockPos, m_World->GetBlockMeta( a_BlockPos ), a_FromBlock )
+ || cRedstone::IsRepeaterPointingTo( a_BlockPos, m_World->GetBlockMeta( a_BlockPos ), a_FromBlock - Vector3i(0, 1, 0) ) ) // Check if repeater is next/below wire
+ {
+ return 2;
+ }
+ else if( cRedstone::IsRepeaterPointingAway( a_BlockPos, m_World->GetBlockMeta( a_BlockPos ), a_FromBlock ) )
+ {
+ SetRepeater( a_BlockPos, 10, false );
+ }
+ }
+ case E_BLOCK_REDSTONE_REPEATER_OFF:
+ if( cRedstone::IsRepeaterPointingAway( a_BlockPos, m_World->GetBlockMeta( a_BlockPos ), a_FromBlock ) )
+ {
+ SetRepeater( a_BlockPos, 10, false );
+ }
+ break;
default:
if( Block != E_BLOCK_AIR && Block != E_BLOCK_REDSTONE_TORCH_ON && Block != E_BLOCK_REDSTONE_TORCH_OFF )
{
@@ -330,6 +468,8 @@ int cRedstoneSimulator::UnPowerBlock( const Vector3i & a_BlockPos ) // Also returns all energy sources it encountered
cRedstoneSimulator::BlockList cRedstoneSimulator::RemoveCurrent( const Vector3i & a_BlockPos )
{
+
+
std::deque< Vector3i > SpreadStack;
std::deque< Vector3i > FoundSources;
@@ -350,7 +490,28 @@ cRedstoneSimulator::BlockList cRedstoneSimulator::RemoveCurrent( const Vector3i };
char Block = m_World->GetBlock( a_BlockPos );
- if( Block == E_BLOCK_REDSTONE_TORCH_OFF || Block == E_BLOCK_REDSTONE_TORCH_ON )
+ if( Block == E_BLOCK_REDSTONE_REPEATER_ON || Block == E_BLOCK_REDSTONE_REPEATER_OFF )
+ {
+ static Vector3i Surroundings [] = { // Repeaters only spread right in front and 1 block up
+ Vector3i( 0, 0, 0),
+ Vector3i( 0, 1, 0),
+ };
+ Vector3i Direction = cRedstone::GetRepeaterDirection( m_World->GetBlockMeta( a_BlockPos ) );
+ for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
+ {
+ Vector3i pos = a_BlockPos + Direction + Surroundings[i];
+ int RetVal = UnPowerBlock( pos, a_BlockPos );
+ if( RetVal == 1 )
+ {
+ SpreadStack.push_back( pos ); // Changed, so add to stack
+ }
+ else if( RetVal == 2 )
+ {
+ FoundSources.push_back( pos );
+ }
+ }
+ }
+ else if( Block == E_BLOCK_REDSTONE_TORCH_OFF || Block == E_BLOCK_REDSTONE_TORCH_ON )
{
static Vector3i Surroundings [] = { // Torches only spread on the same level
Vector3i(-1, 0, 0),
@@ -362,7 +523,7 @@ cRedstoneSimulator::BlockList cRedstoneSimulator::RemoveCurrent( const Vector3i for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
{
Vector3i pos = Vector3i( a_BlockPos ) + Surroundings[i];
- int RetVal = UnPowerBlock( pos );
+ int RetVal = UnPowerBlock( pos, a_BlockPos );
if( RetVal == 1 )
{
SpreadStack.push_back( pos ); // Changed, so add to stack
@@ -387,7 +548,7 @@ cRedstoneSimulator::BlockList cRedstoneSimulator::RemoveCurrent( const Vector3i for( unsigned int i = 0; i < ARRAYCOUNT( Surroundings ); ++i )
{
Vector3i OtherPos = pos + Surroundings[i];
- int RetVal = UnPowerBlock( OtherPos );
+ int RetVal = UnPowerBlock( OtherPos, pos );
if( RetVal == 1 )
{
SpreadStack.push_back( OtherPos ); // Changed, so add to stack
@@ -406,57 +567,72 @@ cRedstoneSimulator::BlockList cRedstoneSimulator::RemoveCurrent( const Vector3i -bool cRedstoneSimulator::IsPowered( const Vector3i & a_BlockPos, bool a_bOnlyByWire /* = false */ )
+bool cRedstoneSimulator::IsPowering( const Vector3i & a_PowerPos, const Vector3i & a_BlockPos, eRedstoneDirection a_WireDirection, bool a_bOnlyByWire )
{
- char NegX = m_World->GetBlock( a_BlockPos.x-1, a_BlockPos.y, a_BlockPos.z );
- if( !a_bOnlyByWire && NegX == E_BLOCK_REDSTONE_TORCH_ON ) return true;
- if( NegX == E_BLOCK_REDSTONE_WIRE )
+ char PowerBlock = m_World->GetBlock( a_PowerPos );
+ if( !a_bOnlyByWire && PowerBlock == E_BLOCK_REDSTONE_TORCH_ON ) return true;
+ if( PowerBlock == E_BLOCK_REDSTONE_REPEATER_ON ) // A repeater pointing towards block is regarded as wire
{
- if( m_World->GetBlockMeta( a_BlockPos.x-1, a_BlockPos.y, a_BlockPos.z ) > 0 )
+ if( cRedstone::IsRepeaterPointingTo( a_PowerPos, m_World->GetBlockMeta( a_PowerPos ), a_BlockPos ) )
{
- if( GetDirection( a_BlockPos.x-1, a_BlockPos.y, a_BlockPos.z ) == REDSTONE_X_POS )
- {
- return true;
- }
+ return true;
}
}
- char PosX = m_World->GetBlock( a_BlockPos.x+1, a_BlockPos.y, a_BlockPos.z );
- if( !a_bOnlyByWire && PosX == E_BLOCK_REDSTONE_TORCH_ON ) return true;
- if( PosX == E_BLOCK_REDSTONE_WIRE )
+ if( PowerBlock == E_BLOCK_REDSTONE_WIRE )
{
- if( m_World->GetBlockMeta( a_BlockPos.x+1, a_BlockPos.y, a_BlockPos.z ) > 0 )
+ if( m_World->GetBlockMeta( a_PowerPos ) > 0 )
{
- if( GetDirection( a_BlockPos.x+1, a_BlockPos.y, a_BlockPos.z ) == REDSTONE_X_NEG )
+ if( GetDirection( a_PowerPos ) == a_WireDirection )
{
return true;
}
}
}
- char NegZ = m_World->GetBlock( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z-1 );
- if( !a_bOnlyByWire && NegZ == E_BLOCK_REDSTONE_TORCH_ON ) return true;
- if( NegZ == E_BLOCK_REDSTONE_WIRE )
+
+ return false;
+}
+
+
+
+
+
+bool cRedstoneSimulator::IsPowered( const Vector3i & a_BlockPos, bool a_bOnlyByWire /* = false */ )
+{
+ char Block = m_World->GetBlock( a_BlockPos );
+ if( Block == E_BLOCK_REDSTONE_REPEATER_OFF || Block == E_BLOCK_REDSTONE_REPEATER_ON )
{
- if( m_World->GetBlockMeta( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z-1 ) > 0 )
+ Vector3i Behind = a_BlockPos - cRedstone::GetRepeaterDirection( m_World->GetBlockMeta( a_BlockPos ) );
+ char BehindBlock = m_World->GetBlock( Behind );
+ if( BehindBlock == E_BLOCK_REDSTONE_TORCH_ON )
{
- if( GetDirection( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z-1 ) == REDSTONE_Z_POS )
+ return true;
+ }
+ if( BehindBlock == E_BLOCK_REDSTONE_WIRE )
+ {
+ if( m_World->GetBlockMeta( Behind ) > 0 )
{
return true;
}
}
- }
- char PosZ = m_World->GetBlock( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z+1 );
- if( !a_bOnlyByWire && PosZ == E_BLOCK_REDSTONE_TORCH_ON ) return true;
- if( PosZ == E_BLOCK_REDSTONE_WIRE )
- {
- if( m_World->GetBlockMeta( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z+1 ) > 0 )
+ if( BehindBlock == E_BLOCK_REDSTONE_REPEATER_ON )
{
- if( GetDirection( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z+1 ) == REDSTONE_Z_NEG )
+ if( cRedstone::IsRepeaterPointingTo( Behind, m_World->GetBlockMeta( Behind ), a_BlockPos ) )
{
return true;
}
}
+ return false;
}
+ if( IsPowering( Vector3i( a_BlockPos.x-1, a_BlockPos.y, a_BlockPos.z ), a_BlockPos, REDSTONE_X_POS, a_bOnlyByWire ) )
+ return true;
+ if( IsPowering( Vector3i( a_BlockPos.x+1, a_BlockPos.y, a_BlockPos.z ), a_BlockPos, REDSTONE_X_NEG, a_bOnlyByWire ) )
+ return true;
+ if( IsPowering( Vector3i( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z-1 ), a_BlockPos, REDSTONE_Z_POS, a_bOnlyByWire ) )
+ return true;
+ if( IsPowering( Vector3i( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z+1 ), a_BlockPos, REDSTONE_Z_NEG, a_bOnlyByWire ) )
+ return true;
+
// Only wires can power the bottom block
char PosY = m_World->GetBlock( a_BlockPos.x, a_BlockPos.y+1, a_BlockPos.z );
if( PosY == E_BLOCK_REDSTONE_WIRE )
@@ -473,7 +649,7 @@ bool cRedstoneSimulator::IsPowered( const Vector3i & a_BlockPos, bool a_bOnlyByW -// Believe me, it works!!
+// Believe me, it works!! TODO: Add repeaters and low/high wires
cRedstoneSimulator::eRedstoneDirection cRedstoneSimulator::GetDirection( int a_X, int a_Y, int a_Z )
{
int Dir = REDSTONE_NONE;
diff --git a/source/cRedstoneSimulator.h b/source/cRedstoneSimulator.h index 853816f3b..927902f5a 100644 --- a/source/cRedstoneSimulator.h +++ b/source/cRedstoneSimulator.h @@ -26,17 +26,56 @@ public: eRedstoneDirection GetDirection( int a_X, int a_Y, int a_Z );
eRedstoneDirection GetDirection( const Vector3i & a_Pos ) { return GetDirection( a_Pos.x, a_Pos.y, a_Pos.z ); }
private:
+ struct sRepeaterChange
+ {
+ Vector3i Position;
+ int Ticks;
+ bool bPowerOn;
+ bool bPowerOffNextTime;
+ };
+
typedef std::deque <Vector3i> BlockList;
+ typedef std::deque< sRepeaterChange > RepeaterList;
+ RepeaterList m_SetRepeaters;
+ void SetRepeater( const Vector3i & a_Position, int a_Ticks, bool a_bPowerOn )
+ {
+ for( RepeaterList::iterator itr = m_SetRepeaters.begin(); itr != m_SetRepeaters.end(); ++itr )
+ {
+ sRepeaterChange & Change = *itr;
+ if( Change.Position.Equals( a_Position ) )
+ {
+ if( Change.bPowerOn && a_bPowerOn == false )
+ {
+ Change.bPowerOffNextTime = true;
+ }
+ if( a_bPowerOn == true )
+ {
+ Change.bPowerOffNextTime = false;
+ }
+ Change.bPowerOn |= a_bPowerOn;
+ return;
+ }
+ }
+
+ sRepeaterChange RC;
+ RC.Position = a_Position;
+ RC.Ticks = a_Ticks;
+ RC.bPowerOn = a_bPowerOn;
+ RC.bPowerOffNextTime = false;
+ m_SetRepeaters.push_back( RC );
+ }
+
virtual void AddBlock(int a_X, int a_Y, int a_Z) {}
void HandleChange( const Vector3i & a_BlockPos );
BlockList RemoveCurrent( const Vector3i & a_BlockPos );
bool PowerBlock( const Vector3i & a_BlockPos, const Vector3i & a_FromBlock, char a_Power );
- int UnPowerBlock( const Vector3i & a_BlockPos );
+ int UnPowerBlock( const Vector3i & a_BlockPos, const Vector3i & a_FromBlock );
bool IsPowered( const Vector3i & a_BlockPos, bool a_bOnlyByWire = false );
+ bool IsPowering( const Vector3i & a_PowerPos, const Vector3i & a_BlockPos, eRedstoneDirection a_WireDirection, bool a_bOnlyByWire );
BlockList m_Blocks;
BlockList m_BlocksBuffer;
@@ -44,6 +83,7 @@ private: BlockList m_RefreshPistons;
BlockList m_RefreshTorchesAround;
+
void RefreshTorchesAround( const Vector3i & a_BlockPos );
cCriticalSection m_CS;
|