flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Patch with diff file created by Sebi (implemented some stuff like lava physics, drops are deleted when in lava, water is now slower, lava gives actual damage etc.). Pistons now work mostly as they should. They do not yet show the motion animation and do not emit sound. They do extend, push, and retract as they should though. Right now the only way to activate a piston is to light redstone wire adjacent to it with a redstone torch.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@67 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
admin@omencraft.com
2011-11-06 09:23:20 +00:00
parent 6df50b40ee
commit 36f7084e3f
15 changed files with 540 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/cPiston.cpp
+200 -219
View File
@@ -14,76 +14,67 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz )
//cWorld* World = cRoot::Get()->GetWorld();
char metadata = 0;
char extmetadata = 0;
int FirstFluidBlock = 0;
int FirstFluidBlock = 0;
char piston;
piston = m_World->GetBlock( pistx, pisty, pistz );
printf("psPiston1\n");
if ( piston == E_BLOCK_STICKY_PISTON ) {
printf("psPiston2\n");
extmetadata = 8;
}//if sticky piston than top nibble bit is set to 1;
}//if sticky piston than top nibble's bit is set to 1;
if ( ( piston == E_BLOCK_STICKY_PISTON ) || ( piston == E_BLOCK_PISTON ) ) {
metadata = m_World->GetBlockMeta( pistx, pisty, pistz);
printf("psPiston3\n");
printf("metadata %c\n",metadata);
if (metadata < 5) { //piston not extended
printf("metadata %c\n",metadata);
metadata -= 8; //removing 8 from retracts it
switch (metadata) {
if ((int)metadata < 6) { //piston not extended
switch ((int)metadata) {
case 0:
FirstFluidBlock = FindFluidBlock ( pistx, pisty, pistz, pistx, pisty-16, pistz );
FirstFluidBlock = FindFluidBlock ( pistx, pisty-1, pistz, pistx, pisty-16, pistz );
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty-FirstFluidBlock, pistz );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, (char)metadata + 8 );
m_World->FastSetBlock( pistx, pisty-1, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata );
m_World->SetBlock( pistx, pisty-1, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata );
break;
case 1:
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz, pistx, pisty+16, pistz);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty+FirstFluidBlock, pistz );
}
FirstFluidBlock = FindFluidBlock (pistx, pisty+1, pistz, pistx, pisty+16, pistz);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty+FirstFluidBlock, pistz );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, (char)metadata + 8 );
m_World->FastSetBlock( pistx, pisty+1, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata+1 );
m_World->SetBlock( pistx, pisty+1, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata+1 );
break;
case 2:
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz, pistx, pisty, pistz-16);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty, pistz-FirstFluidBlock );
}
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz-1, pistx, pisty, pistz-16);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty, pistz-FirstFluidBlock );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, (char)metadata + 8 );
m_World->FastSetBlock( pistx, pisty, pistz-1, E_BLOCK_PISTON_EXTENSION, extmetadata+2 );
m_World->SetBlock( pistx, pisty, pistz-1, E_BLOCK_PISTON_EXTENSION, extmetadata+2 );
break;
case 3:
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz, pistx, pisty, pistz+16);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty, pistz+FirstFluidBlock );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, (char)metadata + 8 );
m_World->FastSetBlock( pistx, pisty, pistz+1, E_BLOCK_PISTON_EXTENSION, extmetadata+3 );
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz+1, pistx, pisty, pistz+16);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx, pisty, pistz+FirstFluidBlock );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, (char)metadata + 8 );
m_World->SetBlock( pistx, pisty, pistz+1, E_BLOCK_PISTON_EXTENSION, extmetadata+3 );
break;
case 4:
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz, pistx-16, pisty, pistz);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx-FirstFluidBlock, pisty, pistz );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, metadata + 8 );
m_World->FastSetBlock( pistx, pisty+1, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata+4 );
FirstFluidBlock = FindFluidBlock (pistx-1, pisty, pistz, pistx-16, pisty, pistz);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx-FirstFluidBlock, pisty, pistz );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, metadata + 8 );
m_World->SetBlock( pistx-1, pisty, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata+4 );
break;
case 5:
FirstFluidBlock = FindFluidBlock (pistx, pisty, pistz, pistx+16, pisty, pistz);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx+FirstFluidBlock, pisty, pistz );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, metadata + 8 );
m_World->FastSetBlock( pistx, pisty+1, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata+5 );
FirstFluidBlock = FindFluidBlock (pistx+1, pisty, pistz, pistx+16, pisty, pistz);
if (FirstFluidBlock > 0) {
ChainMove ( pistx, pisty, pistz, pistx+FirstFluidBlock, pisty, pistz );
}
m_World->FastSetBlock( pistx, pisty, pistz, piston, metadata + 8 );
m_World->SetBlock( pistx+1, pisty, pistz, E_BLOCK_PISTON_EXTENSION, extmetadata+5 );
break;
}
}
@@ -93,9 +84,11 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz )
void cPiston::RetractPiston( int pistx, int pisty, int pistz )
{
char metadata = m_World->GetBlockMeta( pistx, pisty, pistz);
char tempmeta;
char tempblock;
if ( (int)m_World->GetBlock( pistx, pisty, pistz ) == E_BLOCK_PISTON ) {
if (metadata > 5) { //piston retracted
if (metadata > 5) { //piston retracted
metadata -= 8;//set the piston to retracted state.
m_World->FastSetBlock( pistx, pisty, pistz, m_World->GetBlock( pistx, pisty, pistz ), metadata );
@@ -108,90 +101,102 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
case 1:
if ( m_World->GetBlock( pistx, pisty+1, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty+1, pistz, 0, 0 );
m_World->SetBlock( pistx, pisty+1, pistz, 0, 0 );
}
break;
case 2:
if ( m_World->GetBlock( pistx, pisty, pistz-1 ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty, pistz-1, 0, 0 );
m_World->SetBlock( pistx, pisty, pistz-1, 0, 0 );
}
break;
case 3:
if ( m_World->GetBlock( pistx, pisty, pistz+1 ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty, pistz+1, 0, 0 );
m_World->SetBlock( pistx, pisty, pistz+1, 0, 0 );
}
break;
case 4:
if ( m_World->GetBlock( pistx-1, pisty, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx-1, pisty, pistz, 0, 0 );
m_World->SetBlock( pistx-1, pisty, pistz, 0, 0 );
}
break;
case 5:
if ( m_World->GetBlock( pistx+1, pisty, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx+1, pisty, pistz, 0, 0 );
m_World->SetBlock( pistx+1, pisty, pistz, 0, 0 );
}
break;
}
}
}
}
if ( (int)m_World->GetBlock( pistx, pisty, pistz ) == E_BLOCK_PISTON ) {
if (metadata > 5) { //piston retracted
metadata -= 8;//set the piston to retracted state.
if ( (int)m_World->GetBlock( pistx, pisty, pistz ) == E_BLOCK_STICKY_PISTON ) {
if (metadata > 5) { //piston retracted
metadata -= 8;//set the piston to retracted state.
m_World->FastSetBlock( pistx, pisty, pistz, m_World->GetBlock( pistx, pisty, pistz ), metadata );
switch (metadata) {
case 0:
if ( m_World->GetBlock( pistx, pisty-1, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
tempblock = m_World->GetBlock( pistx, pisty-2, pistz );
tempmeta = m_World->GetBlockMeta( pistx, pisty-2, pistz );
m_World->SetBlock( pistx, pisty-1, pistz, 0, 0 );
m_World->SetBlock( pistx, pisty-1, pistz, tempblock, tempmeta );
m_World->SetBlock( pistx, pisty-2, pistz, 0, 0 );
}
break;
m_World->FastSetBlock( pistx, pisty, pistz, m_World->GetBlock( pistx, pisty, pistz ), metadata );
switch (metadata) {
case 0:
if ( m_World->GetBlock( pistx, pisty-1, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty-1, pistz, m_World->GetBlock( pistx, pisty-2, pistz ), m_World->GetBlockMeta( pistx, pisty-2, pistz ) );
m_World->SetBlock( pistx, pisty-2, pistz, 0, 0 );
}
break;
case 1:
if ( m_World->GetBlock( pistx, pisty+1, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty-1, pistz, m_World->GetBlock( pistx, pisty-2, pistz ), m_World->GetBlockMeta( pistx, pisty-2, pistz ) );
m_World->SetBlock( pistx, pisty-2, pistz, 0, 0 );
}
break;
case 2:
if ( m_World->GetBlock( pistx, pisty, pistz-1) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty, pistz-1, m_World->GetBlock( pistx, pisty, pistz-2 ), m_World->GetBlockMeta( pistx, pisty, pistz-2 ) );
m_World->SetBlock( pistx, pisty, pistz-2, 0, 0 );
}
break;
case 3:
if ( m_World->GetBlock( pistx, pisty, pistz+1) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx, pisty, pistz+1, m_World->GetBlock( pistx, pisty, pistz+2 ), m_World->GetBlockMeta( pistx, pisty, pistz+2 ) );
m_World->SetBlock( pistx, pisty, pistz+2, 0, 0 );
}
break;
case 4:
if ( m_World->GetBlock( pistx-1, pisty, pistz) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx-1, pisty, pistz, m_World->GetBlock( pistx-2, pisty, pistz ), m_World->GetBlockMeta( pistx-2, pisty, pistz ) );
m_World->SetBlock( pistx-2, pisty, pistz, 0, 0 );
}
break;
case 5:
if ( m_World->GetBlock( pistx+1, pisty, pistz) == E_BLOCK_PISTON_EXTENSION ) {
m_World->SetBlock( pistx+1, pisty, pistz, m_World->GetBlock( pistx+2, pisty, pistz ), m_World->GetBlockMeta( pistx+2, pisty, pistz ) );
m_World->SetBlock( pistx+2, pisty, pistz, 0, 0 );
}
break;
}
}
}
case 1:
if ( m_World->GetBlock( pistx, pisty+1, pistz ) == E_BLOCK_PISTON_EXTENSION ) {
tempblock = m_World->GetBlock( pistx, pisty+2, pistz );
tempmeta = m_World->GetBlockMeta( pistx, pisty+2, pistz );
m_World->SetBlock( pistx, pisty+1, pistz, 0, 0 );
m_World->SetBlock( pistx, pisty+1, pistz, tempblock , tempmeta );
m_World->SetBlock( pistx, pisty+2, pistz, 0, 0 );
}
break;
case 2:
if ( m_World->GetBlock( pistx, pisty, pistz-1) == E_BLOCK_PISTON_EXTENSION ) {
tempblock = m_World->GetBlock( pistx, pisty, pistz-2 );
tempmeta = m_World->GetBlockMeta( pistx, pisty, pistz-2 );
m_World->SetBlock( pistx, pisty, pistz-1, 0, 0 );
m_World->SetBlock( pistx, pisty, pistz-1, tempblock, tempmeta );
m_World->SetBlock( pistx, pisty, pistz-2, 0, 0 );
}
break;
case 3:
if ( m_World->GetBlock( pistx, pisty, pistz+1) == E_BLOCK_PISTON_EXTENSION ) {
tempblock = m_World->GetBlock( pistx, pisty, pistz+2 );
tempmeta = m_World->GetBlockMeta( pistx, pisty, pistz+2 );
m_World->SetBlock( pistx, pisty, pistz+1, 0, 0 );
m_World->SetBlock( pistx, pisty, pistz+1, tempblock, tempmeta );
m_World->SetBlock( pistx, pisty, pistz+2, 0, 0 );
}
break;
case 4:
if ( m_World->GetBlock( pistx-1, pisty, pistz) == E_BLOCK_PISTON_EXTENSION ) {
tempblock = m_World->GetBlock( pistx-2, pisty, pistz );
tempmeta = m_World->GetBlockMeta( pistx-2, pisty, pistz );
m_World->SetBlock( pistx-1, pisty, pistz, 0, 0 );
m_World->SetBlock( pistx-1, pisty, pistz, tempblock, tempmeta );
m_World->SetBlock( pistx-2, pisty, pistz, 0, 0 );
}
break;
case 5:
if ( m_World->GetBlock( pistx+1, pisty, pistz) == E_BLOCK_PISTON_EXTENSION ) {
tempblock = m_World->GetBlock( pistx+2, pisty, pistz );
tempmeta = m_World->GetBlockMeta( pistx+2, pisty, pistz );
m_World->SetBlock( pistx+1, pisty, pistz, 0, 0 );
m_World->SetBlock( pistx+1, pisty, pistz, tempblock, tempmeta );
m_World->SetBlock( pistx+2, pisty, pistz, 0, 0 );
}
break;
}
}
}
}
void cPiston::ChainMove ( int ax, int ay, int az, int bx, int by, int bz )
@@ -202,27 +207,23 @@ char lastblock;
if ( ( ax != bx ) && ( ay == by ) && ( az == bz ) ) { //move x
if ( ax < bx ) {
if ( ax > bx ) {
while ( ax > bx ) {
lastmeta = m_World->GetBlockMeta( bx+1, by, bz);
lastblock = m_World->GetBlockMeta( bx+1, by, bz);
m_World->SetBlock( bx, by, bz, lastblock, lastmeta );
bx+1;
lastmeta = m_World->GetBlockMeta( bx, by, bz);
lastblock = m_World->GetBlock( bx, by, bz);
m_World->SetBlock( bx+1, by, bz, lastblock, lastmeta );
bx += 1;
}
} else {
while ( ax < bx ) {
lastmeta = m_World->GetBlockMeta( bx-1, by, bz);
lastblock = m_World->GetBlockMeta( bx-1, by, bz);
m_World->SetBlock( bx, by, bz, lastblock, lastmeta );
bx-1;
}
while ( ax < bx ) {
lastmeta = m_World->GetBlockMeta( bx, by, bz);
lastblock = m_World->GetBlock( bx, by, bz);
m_World->SetBlock( bx+1, by, bz, lastblock, lastmeta );
bx -= 1;
}
}
@@ -230,57 +231,49 @@ char lastblock;
} else if ( ( ax == bx ) && ( ay != by ) && ( az == bz ) ) { //move y
if ( ay < by ) {
if ( ay > by ) {
while ( ay > by ) {
while ( ay > by ) {
lastmeta = m_World->GetBlockMeta( bx, by, bz);
lastblock = m_World->GetBlock( bx, by, bz);
m_World->SetBlock( bx, by-1, bz, lastblock, lastmeta );
by += 1 ;
}
lastmeta = m_World->GetBlockMeta( bx, by+1, bz);
lastblock = m_World->GetBlockMeta( bx, by+1, bz);
m_World->SetBlock( bx, by, bz, lastblock, lastmeta );
by+1;
} else {
}
while ( ay < by ) {
lastmeta = m_World->GetBlockMeta( bx, by, bz);
lastblock = m_World->GetBlock( bx, by, bz);
m_World->SetBlock( bx, by+1, bz, lastblock, lastmeta );
by -= 1;
}
} else {
while ( ay < by ) {
lastmeta = m_World->GetBlockMeta( bx, by-1, bz);
lastblock = m_World->GetBlockMeta( bx, by-1, bz);
m_World->SetBlock( bx, by, bz, lastblock, lastmeta );
by-1;
}
}
}
m_World->SetBlock( ax, ay, az, 0, 0 );
} else if ( ( ax == bx ) && ( ay == by ) && ( az != bz ) ) { //move z
if ( az < bz ) {
if ( az > bz ) {
while ( az > bz ) {
while ( az > bz ) {
lastmeta = m_World->GetBlockMeta( bx, by, bz );
lastblock = m_World->GetBlock( bx, by, bz );
m_World->SetBlock( bx, by, bz-1, lastblock, lastmeta );
bz += 1;
}
lastmeta = m_World->GetBlockMeta( bx, by, bz+1 );
lastblock = m_World->GetBlockMeta( bx, by, bz+1 );
m_World->SetBlock( bx, by, bz, lastblock, lastmeta );
bz+1;
} else {
}
while ( az < bz ) {
lastmeta = m_World->GetBlockMeta( bx, by, bz );
lastblock = m_World->GetBlock( bx, by, bz );
m_World->SetBlock( bx, by, bz+1, lastblock, lastmeta );
bz -= 1;
}
} else {
while ( az < bz ) {
lastmeta = m_World->GetBlockMeta( bx, by, bz-1 );
lastblock = m_World->GetBlockMeta( bx, by, bz-1 );
m_World->SetBlock( bx, by, bz, lastblock, lastmeta );
bz-1;
}
}
}
m_World->SetBlock( ax, ay, az, 0, 0 );
@@ -299,104 +292,92 @@ int cPiston::FindFluidBlock ( int ax, int ay, int az, int bx, int by, int bz )
char thisblock;
int cnt = 0;
if ( ( ax != bx ) && ( ay == by ) && ( az == bz ) ) { //check x
if ( ( ax != bx ) && ( ay == by ) && ( az == bz ) ) { //check x
if ( ax < bx ) {
while ( ax < bx ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( (thisblock == 0) || (thisblock == E_BLOCK_STATIONARY_WATER) || (thisblock == E_BLOCK_WATER) || (thisblock == E_BLOCK_STATIONARY_LAVA) || (thisblock == E_BLOCK_LAVA) ) {
return cnt;
if ( ax < bx ) {
while ( ax < bx ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( ((int)thisblock == 0) || ((int)thisblock == E_BLOCK_STATIONARY_WATER) || ((int)thisblock == E_BLOCK_WATER) || ((int)thisblock == E_BLOCK_STATIONARY_LAVA) || ((int)thisblock == E_BLOCK_LAVA) ) {
return cnt;
}
cnt++;
ax+1;
}
ax += 1;
}
} else {
} else {
while ( ax > bx ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( (thisblock == 0) || (thisblock == E_BLOCK_STATIONARY_WATER) || (thisblock == E_BLOCK_WATER) || (thisblock == E_BLOCK_STATIONARY_LAVA) || (thisblock == E_BLOCK_LAVA) ) {
return cnt;
while ( ax > bx ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( ((int)thisblock == 0) || ((int)thisblock == E_BLOCK_STATIONARY_WATER) || ((int)thisblock == E_BLOCK_WATER) || ((int)thisblock == E_BLOCK_STATIONARY_LAVA) || ((int)thisblock == E_BLOCK_LAVA) ) {
return cnt;
}
cnt++;
ax-1;
ax -= 1;
}
}
}
}
return cnt;
m_World->SetBlock( ax, ay, az, 0, 0 );
} else if ( ( ax == bx ) && ( ay != by ) && ( az == bz ) ) { //check y
} else if ( ( ax == bx ) && ( ay != by ) && ( az == bz ) ) { //check y
if ( ay < by ) {
if ( ay < by ) {
while ( ay < by ) {
thisblock = m_World->GetBlock( bx, by, bz);
if ( (thisblock == 0) || (thisblock == E_BLOCK_STATIONARY_WATER) || (thisblock == E_BLOCK_WATER) || (thisblock == E_BLOCK_STATIONARY_LAVA) || (thisblock == E_BLOCK_LAVA) ) {
return cnt;
while ( ay < by ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( ((int)thisblock == 0) || ((int)thisblock == E_BLOCK_STATIONARY_WATER) || ((int)thisblock == E_BLOCK_WATER) || ((int)thisblock == E_BLOCK_STATIONARY_LAVA) || ((int)thisblock == E_BLOCK_LAVA) ) {
return cnt;
}
cnt++;
ay+1;
ay += 1;
}
}
} else {
} else {
while ( ay > by ) {
thisblock = m_World->GetBlock( bx, by, bz);
if ( (thisblock == 0) || (thisblock == E_BLOCK_STATIONARY_WATER) || (thisblock == E_BLOCK_WATER) || (thisblock == E_BLOCK_STATIONARY_LAVA) || (thisblock == E_BLOCK_LAVA) ) {
return cnt;
while ( ay > by ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( ((int)thisblock == 0) || ((int)thisblock == E_BLOCK_STATIONARY_WATER) || ((int)thisblock == E_BLOCK_WATER) || ((int)thisblock == E_BLOCK_STATIONARY_LAVA) || ((int)thisblock == E_BLOCK_LAVA) ) {
return cnt;
}
cnt++;
ay-1;
ay -= 1;
}
}
}
}
return cnt;
m_World->SetBlock( ax, ay, az, 0, 0 );
} else if ( ( ax == bx ) && ( ay == by ) && ( az != bz ) ) { //check z
} else if ( ( ax == bx ) && ( ay == by ) && ( az != bz ) ) { //check z
if ( az < bz ) {
if ( az < bz ) {
while ( az < bz ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( (thisblock == 0) || (thisblock == E_BLOCK_STATIONARY_WATER) || (thisblock == E_BLOCK_WATER) || (thisblock == E_BLOCK_STATIONARY_LAVA) || (thisblock == E_BLOCK_LAVA) ) {
return cnt;
while ( az < bz ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( ((int)thisblock == 0) || ((int)thisblock == E_BLOCK_STATIONARY_WATER) || ((int)thisblock == E_BLOCK_WATER) || ((int)thisblock == E_BLOCK_STATIONARY_LAVA) || ((int)thisblock == E_BLOCK_LAVA) ) {
return cnt;
}
cnt++;
az+1;
az += 1;
}
}
} else {
} else {
while ( az > bz ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( (thisblock == 0) || (thisblock == E_BLOCK_STATIONARY_WATER) || (thisblock == E_BLOCK_WATER) || (thisblock == E_BLOCK_STATIONARY_LAVA) || (thisblock == E_BLOCK_LAVA) ) {
return cnt;
while ( az > bz ) {
thisblock = m_World->GetBlock( ax, ay, az);
if ( ((int)thisblock == 0) || ((int)thisblock == E_BLOCK_STATIONARY_WATER) || ((int)thisblock == E_BLOCK_WATER) || ((int)thisblock == E_BLOCK_STATIONARY_LAVA) || ((int)thisblock == E_BLOCK_LAVA) ) {
return cnt;
}
cnt++;
az-1;
az -= 1;
}
}
}
}
return cnt;
} else {
return cnt;
}
} else {
return cnt;
}
}