diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-22 16:35:10 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-02-22 16:35:10 +0100 |
| commit | d9c25a161e62ffd04353fbdb10e2ffa1cfe98039 (patch) | |
| tree | 686cf865711b7bca0148433f4b799400a6587dbd /source/cRedstone.cpp | |
| parent | Added a CriticalSection to cPlugin_NewLua. Lua plugins are not threadsafe but they ARE accessed by multiple threads, this can create some hard to find errors, but I fixed it now :P (diff) | |
| download | cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.gz cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.bz2 cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.lz cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.xz cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.tar.zst cuberite-d9c25a161e62ffd04353fbdb10e2ffa1cfe98039.zip | |
Diffstat (limited to 'source/cRedstone.cpp')
| -rw-r--r-- | source/cRedstone.cpp | 251 |
1 files changed, 135 insertions, 116 deletions
diff --git a/source/cRedstone.cpp b/source/cRedstone.cpp index 567394d0c..6e52d89c6 100644 --- a/source/cRedstone.cpp +++ b/source/cRedstone.cpp @@ -12,6 +12,12 @@ +bool cRedstone::s_UseRedstone = true;
+
+
+
+
+
cRedstone::cRedstone( cWorld* a_World )
:m_World ( a_World )
,m_Metadata ( 0 )
@@ -20,92 +26,102 @@ cRedstone::cRedstone( cWorld* a_World ) }
+
+
+
+
void cRedstone::ChangeRedstone( int fillx, int filly, int fillz, bool added )
{
-char before;
-//int tempX;
-//int tempY;
-//int tempZ;
-//int state;
-//m_Direction
-// 0 = x+
-// 1 = x-
-// 2 = z+
-// 3 = z-
-// 4 = y+
-// 5 = v-
-
-
- if (added) {
- m_Metadata = 15;
- } else {
- m_Metadata = 0;
- }
- before = m_Metadata;
-
- //printf("etb1\n");
- CalculatetRedstone( fillx, filly, fillz ); //calculate all item centers.
- //printf("etb2\n");
-
- int Block = (int)m_World->GetBlock( fillx, filly, fillz );
+ if( !s_UseRedstone ) return;
+
+ char before;
+ //int tempX;
+ //int tempY;
+ //int tempZ;
+ //int state;
+ //m_Direction
+ // 0 = x+
+ // 1 = x-
+ // 2 = z+
+ // 3 = z-
+ // 4 = y+
+ // 5 = v-
+
+
+ if (added) {
+ m_Metadata = 15;
+ } else {
+ m_Metadata = 0;
+ }
+ before = m_Metadata;
+
+ //printf("etb1\n");
+ CalculateRedstone( fillx, filly, fillz ); //calculate all item centers.
+ //printf("etb2\n");
+
+ int Block = (int)m_World->GetBlock( fillx, filly, fillz );
- switch (Block)//these blocks won't trigger the normal calculaton because they are affected by the redstone around them. So we check each possible channel around them instead.
- {
- case E_BLOCK_REDSTONE_TORCH_ON:
- case E_BLOCK_REDSTONE_TORCH_OFF:
- case E_BLOCK_AIR:
- case E_BLOCK_PISTON_EXTENSION:
- case E_BLOCK_PISTON:
- case E_BLOCK_STICKY_PISTON:
- {
- m_Metadata = 0;
- m_Direction = 0;
- CalculatetRedstone( fillx+1, filly, fillz );
- m_Metadata = 0;
- m_Direction = 1;
- CalculatetRedstone( fillx-1, filly, fillz );
- m_Metadata = 0;
- m_Direction = 2;
- CalculatetRedstone( fillx, filly, fillz+1 );
- m_Metadata = 0;
- m_Direction = 3;
- CalculatetRedstone( fillx, filly, fillz-1 );
- m_Metadata = 0;
- CalculatetRedstone( fillx, filly-1, fillz );
- break;
- }
- case E_BLOCK_REDSTONE_WIRE: //special case for redstone wire.
- {
- m_Direction = 0;
- CalculatetRedstone( fillx+1, filly, fillz );
- m_Direction = 1;
- CalculatetRedstone( fillx-1, filly, fillz );
- m_Direction = 2;
- CalculatetRedstone( fillx, filly, fillz+1 );
- m_Direction = 3;
- CalculatetRedstone( fillx, filly, fillz-1 );
- m_Metadata = 0;
- CalculatetRedstone( fillx, filly-1, fillz );
-
- m_Direction = 4;
- CalculatetRedstone( fillx+1, filly+1, fillz );
- CalculatetRedstone( fillx-1, filly+1, fillz );
- CalculatetRedstone( fillx, filly+1, fillz+1 );
- CalculatetRedstone( fillx, filly+1, fillz-1 );
-
- m_Direction = 5;
- CalculatetRedstone( fillx+1, filly-1, fillz );
- CalculatetRedstone( fillx-1, filly-1, fillz );
- CalculatetRedstone( fillx, filly-1, fillz+1 );
- CalculatetRedstone( fillx, filly-1, fillz-1 );
- break;
- }
- }
+ switch (Block)//these blocks won't trigger the normal calculaton because they are affected by the redstone around them. So we check each possible channel around them instead.
+ {
+ case E_BLOCK_REDSTONE_TORCH_ON:
+ case E_BLOCK_REDSTONE_TORCH_OFF:
+ case E_BLOCK_AIR:
+ case E_BLOCK_PISTON_EXTENSION:
+ case E_BLOCK_PISTON:
+ case E_BLOCK_STICKY_PISTON:
+ {
+ m_Metadata = 0;
+ m_Direction = 0;
+ CalculateRedstone( fillx+1, filly, fillz );
+ m_Metadata = 0;
+ m_Direction = 1;
+ CalculateRedstone( fillx-1, filly, fillz );
+ m_Metadata = 0;
+ m_Direction = 2;
+ CalculateRedstone( fillx, filly, fillz+1 );
+ m_Metadata = 0;
+ m_Direction = 3;
+ CalculateRedstone( fillx, filly, fillz-1 );
+ m_Metadata = 0;
+ CalculateRedstone( fillx, filly-1, fillz );
+ break;
+ }
+ case E_BLOCK_REDSTONE_WIRE: //special case for redstone wire.
+ {
+ m_Direction = 0;
+ CalculateRedstone( fillx+1, filly, fillz );
+ m_Direction = 1;
+ CalculateRedstone( fillx-1, filly, fillz );
+ m_Direction = 2;
+ CalculateRedstone( fillx, filly, fillz+1 );
+ m_Direction = 3;
+ CalculateRedstone( fillx, filly, fillz-1 );
+ m_Metadata = 0;
+ CalculateRedstone( fillx, filly-1, fillz );
+
+ m_Direction = 4;
+ CalculateRedstone( fillx+1, filly+1, fillz );
+ CalculateRedstone( fillx-1, filly+1, fillz );
+ CalculateRedstone( fillx, filly+1, fillz+1 );
+ CalculateRedstone( fillx, filly+1, fillz-1 );
+
+ m_Direction = 5;
+ CalculateRedstone( fillx+1, filly-1, fillz );
+ CalculateRedstone( fillx-1, filly-1, fillz );
+ CalculateRedstone( fillx, filly-1, fillz+1 );
+ CalculateRedstone( fillx, filly-1, fillz-1 );
+ break;
+ }
+ }
//printf("done here\n");
}
-void cRedstone::CalculatetRedstone( int fillx, int filly, int fillz)
+
+
+
+
+void cRedstone::CalculateRedstone( int fillx, int filly, int fillz)
{
if ( ( (int)m_World->GetBlock( fillx, filly, fillz ) == E_BLOCK_STICKY_PISTON ) || ( (int)m_World->GetBlock( fillx, filly, fillz ) == E_BLOCK_PISTON ) ) {
@@ -127,29 +143,29 @@ void cRedstone::CalculatetRedstone( int fillx, int filly, int fillz) if ( (int)m_World->GetBlockMeta( fillx, filly, fillz) > 6 ) { //button powered
m_Metadata = 15; //change meta to 15 only if redstone power device in on possition is found.
if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx-1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx-1,filly,fillz);
+ CalculateRedstone(fillx-1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx+1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx+1,filly,fillz);
+ CalculateRedstone(fillx+1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz-1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz-1);
+ CalculateRedstone(fillx,filly,fillz-1);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz+1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz+1);
+ CalculateRedstone(fillx,filly,fillz+1);
}
} else {
if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx-1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx-1,filly,fillz);
+ CalculateRedstone(fillx-1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx+1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx+1,filly,fillz);
+ CalculateRedstone(fillx+1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz-1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz-1);
+ CalculateRedstone(fillx,filly,fillz-1);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz+1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz+1);
+ CalculateRedstone(fillx,filly,fillz+1);
}
}
@@ -158,31 +174,31 @@ void cRedstone::CalculatetRedstone( int fillx, int filly, int fillz) if ( (int)m_World->GetBlockMeta( fillx, filly, fillz) == 1 ) { //plate powered
m_Metadata = 15; //change meta to 15 only if redstone power device in on possition is found.
if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx-1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx-1,filly,fillz);
+ CalculateRedstone(fillx-1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx+1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx+1,filly,fillz);
+ CalculateRedstone(fillx+1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz-1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz-1);
+ CalculateRedstone(fillx,filly,fillz-1);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz+1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz+1);
+ CalculateRedstone(fillx,filly,fillz+1);
}
} else {
if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx-1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx-1,filly,fillz);
+ CalculateRedstone(fillx-1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx+1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx+1,filly,fillz);
+ CalculateRedstone(fillx+1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz-1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz-1);
+ CalculateRedstone(fillx,filly,fillz-1);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz+1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz+1);
+ CalculateRedstone(fillx,filly,fillz+1);
}
}
@@ -190,32 +206,32 @@ void cRedstone::CalculatetRedstone( int fillx, int filly, int fillz) //printf("found torch on\n");
m_Metadata = 15; //change meta to 15 only if redstone torch in on possition is found.
if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx-1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx-1,filly,fillz);
+ CalculateRedstone(fillx-1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx+1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx+1,filly,fillz);
+ CalculateRedstone(fillx+1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz-1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz-1);
+ CalculateRedstone(fillx,filly,fillz-1);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz+1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz+1);
+ CalculateRedstone(fillx,filly,fillz+1);
}
} else if ( (int)m_World->GetBlock( fillx, filly, fillz ) == E_BLOCK_REDSTONE_TORCH_OFF ) { //if the torch is off
//printf("found torch off\n");
// no need to change meta here.
if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx-1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx-1,filly,fillz);
+ CalculateRedstone(fillx-1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx+1, filly, fillz) != m_Metadata ) ) {
- CalculatetRedstone(fillx+1,filly,fillz);
+ CalculateRedstone(fillx+1,filly,fillz);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz-1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz-1);
+ CalculateRedstone(fillx,filly,fillz-1);
}
if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz+1) != m_Metadata ) ) {
- CalculatetRedstone(fillx,filly,fillz+1);
+ CalculateRedstone(fillx,filly,fillz+1);
}
} else if ( (int)m_World->GetBlock( fillx, filly, fillz ) == E_BLOCK_REDSTONE_WIRE ) { //simple fill algorithm for redstone wire.
@@ -223,26 +239,26 @@ void cRedstone::CalculatetRedstone( int fillx, int filly, int fillz) if ( (int)m_World->GetBlockMeta( fillx, filly, fillz) != m_Metadata ) {
m_World->FastSetBlock( fillx, filly, fillz, (char)E_BLOCK_REDSTONE_WIRE, m_Metadata );
m_Direction = 0;
- CalculatetRedstone( fillx+1, filly, fillz );
+ CalculateRedstone( fillx+1, filly, fillz );
m_Direction = 1;
- CalculatetRedstone( fillx-1, filly, fillz );
+ CalculateRedstone( fillx-1, filly, fillz );
m_Direction = 2;
- CalculatetRedstone( fillx, filly, fillz+1 );
+ CalculateRedstone( fillx, filly, fillz+1 );
m_Direction = 3;
- CalculatetRedstone( fillx, filly, fillz-1 );
- CalculatetRedstone( fillx, filly-1, fillz ); //check one block below //similar to same plane
+ CalculateRedstone( fillx, filly, fillz-1 );
+ CalculateRedstone( fillx, filly-1, fillz ); //check one block below //similar to same plane
m_Direction = 4;
- CalculatetRedstone( fillx+1, filly+1, fillz );
- CalculatetRedstone( fillx-1, filly+1, fillz );
- CalculatetRedstone( fillx, filly+1, fillz+1 );
- CalculatetRedstone( fillx, filly+1, fillz-1 );
+ CalculateRedstone( fillx+1, filly+1, fillz );
+ CalculateRedstone( fillx-1, filly+1, fillz );
+ CalculateRedstone( fillx, filly+1, fillz+1 );
+ CalculateRedstone( fillx, filly+1, fillz-1 );
m_Direction = 5;
- CalculatetRedstone( fillx+1, filly-1, fillz );
- CalculatetRedstone( fillx-1, filly-1, fillz );
- CalculatetRedstone( fillx, filly-1, fillz+1 );
- CalculatetRedstone( fillx, filly-1, fillz-1 );
+ CalculateRedstone( fillx+1, filly-1, fillz );
+ CalculateRedstone( fillx-1, filly-1, fillz );
+ CalculateRedstone( fillx, filly-1, fillz+1 );
+ CalculateRedstone( fillx, filly-1, fillz-1 );
}
} else { //default, check item for torch attached to it. If meta > 0 then turn that torch off, otherwise turn it on. This change needs to be passed to the next world tick.
@@ -337,6 +353,9 @@ void cRedstone::CalculatetRedstone( int fillx, int filly, int fillz) }
+
+
+
bool cRedstone::IsBlockPowered( int fillx, int filly, int fillz )
{
|