diff options
| author | admin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-11-05 20:31:25 +0100 |
|---|---|---|
| committer | admin@omencraft.com <admin@omencraft.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-11-05 20:31:25 +0100 |
| commit | 7fe70356b9e2186e807f11cbaa9d0baf09e0e129 (patch) | |
| tree | 99df69b85767a8f62be29a4d6ec587864291d48b /source/cRedstone.cpp | |
| parent | Added cPiston.h and cPiston.cpp to VC2010 files. (diff) | |
| download | cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.tar cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.tar.gz cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.tar.bz2 cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.tar.lz cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.tar.xz cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.tar.zst cuberite-7fe70356b9e2186e807f11cbaa9d0baf09e0e129.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cRedstone.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/cRedstone.cpp b/source/cRedstone.cpp index d61d50cbb..1d865373b 100644 --- a/source/cRedstone.cpp +++ b/source/cRedstone.cpp @@ -18,53 +18,53 @@ void cRedstone::ChangeRedstoneTorch( int fillx, int filly, int fillz, bool added metadata = 0;
}
- cWorld* World = cRoot::Get()->GetWorld();
+ //cWorld* World = cRoot::Get()->GetWorld();
- if ( ( (int)World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx+1, filly, fillz, metadata );
}
- if ( ( (int)World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx-1, filly, fillz, metadata );
}
- if ( ( (int)World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx, filly, fillz+1, metadata );
}
- if ( ( (int)World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx, filly, fillz-1, metadata );
}
- if ( ( (int)World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx+1, filly-1, fillz, metadata );
}
- if ( ( (int)World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx-1, filly-1, fillz, metadata );
}
- if ( ( (int)World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx, filly-1, fillz+1, metadata );
}
- if ( ( (int)World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx, filly-1, fillz-1, metadata );
}
- if ( ( (int)World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx+1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx+1, filly+1, fillz, metadata );
}
- if ( ( (int)World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx-1, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx-1, filly+1, fillz, metadata );
}
- if ( ( (int)World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz+1 ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx, filly+1, fillz+1, metadata );
}
- if ( ( (int)World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) ) {
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz-1 ) == E_BLOCK_REDSTONE_WIRE) ) {
LightRedstone( fillx, filly+1, fillz-1, metadata );
}
}
void cRedstone::LightRedstone( int fillx, int filly, int fillz, char metadata)
{
- cWorld* World = cRoot::Get()->GetWorld();
- if ( ( (int)World->GetBlock( fillx, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)World->GetBlockMeta( fillx, filly, fillz) != metadata ) ) {
- World->SetBlock( fillx, filly, fillz, (char)E_BLOCK_REDSTONE_WIRE, metadata );
+ //cWorld* World = cRoot::Get()->GetWorld();
+ if ( ( (int)m_World->GetBlock( fillx, filly, fillz ) == E_BLOCK_REDSTONE_WIRE) && ( (int)m_World->GetBlockMeta( fillx, filly, fillz) != metadata ) ) {
+ m_World->FastSetBlock( fillx, filly, fillz, (char)E_BLOCK_REDSTONE_WIRE, metadata );
LightRedstone(fillx-1,filly,fillz,metadata);
LightRedstone(fillx+1,filly,fillz,metadata);
LightRedstone(fillx,filly,fillz-1,metadata);
|