From 7f87d6c3d6a116742f25f1846d747a33afdc63f0 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 16 Aug 2013 11:23:24 +0100 Subject: Feature and bugfixes [SEE DESC] Added TNT and Hopper minecarts Fixed piston code failing without an extension set Repeaters are now broken Fixed not being able to place a minecart on an activator rail Added much needed comments on piston code Fixed minor formatting issue --- source/Piston.cpp | 83 ++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) (limited to 'source/Piston.cpp') diff --git a/source/Piston.cpp b/source/Piston.cpp index 310fcdfd4..7ffa9febd 100644 --- a/source/Piston.cpp +++ b/source/Piston.cpp @@ -20,7 +20,7 @@ extern bool g_BlockPistonBreakable[]; - +//Replace AddDir (...) with the switch cases that, sets coords in direction of piston face #define AddDir( x, y, z, dir, amount ) \ switch (dir) \ { \ @@ -52,25 +52,26 @@ unsigned short cPiston::FirstPassthroughBlock(int pistonX, int pistonY, int pist pistonmeta &= 7; if (pistonmeta >= 6) { - // Just in case, it shouldn't happen but if it would, it'd case inf loop + // Just in case, it shouldn't happen but if it would, it'd cause inf loop LOGD("cPiston::FirstPassthroughBlock - piston has invalid meta data!\n"); return 9001; } BLOCKTYPE currBlock; - for (ret = 0; ret < 24; ret++) // push up to 24 blocks + NIBBLETYPE currMeta; + for (ret = 0; ret < 24; ret++) //Push up to 24 blocks { - AddDir( pistonX, pistonY, pistonZ, pistonmeta, 1) - currBlock = m_World->GetBlock( pistonX, pistonY, pistonZ ); - if ((currBlock == E_BLOCK_BEDROCK) || (currBlock == E_BLOCK_OBSIDIAN) || (currBlock == E_BLOCK_PISTON_EXTENSION)) + AddDir( pistonX, pistonY, pistonZ, pistonmeta, 1) //Set the coords one further from the piston direction + m_World->GetBlockTypeMeta(pistonX, pistonY, pistonZ, currBlock, currMeta); + if ((currBlock == E_BLOCK_BEDROCK) || (currBlock == E_BLOCK_OBSIDIAN) || (currBlock == E_BLOCK_PISTON_EXTENSION) || ( (currMeta & 0x8) != 0x0 )) { return 9001; } - if (g_BlockPistonBreakable[currBlock]) + if (g_BlockPistonBreakable[currBlock]) //If it's a breakable block (air, torch, etc.) then the line of blocks can be pushed { return ret; } } - return 9001; + return 9001; //There is no space for the blocks to move within 24 spaces, piston can't push } @@ -82,6 +83,7 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz ) BLOCKTYPE pistonBlock; NIBBLETYPE pistonMeta; m_World->GetBlockTypeMeta(pistx, pisty, pistz, pistonBlock, pistonMeta); + char isSticky = (char)(pistonBlock == E_BLOCK_STICKY_PISTON) * 8; if ( (pistonMeta & 0x8) != 0x0 ) { @@ -90,9 +92,9 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz ) } unsigned short dist = FirstPassthroughBlock(pistx, pisty, pistz, pistonMeta); - if (dist > 9000) return; // too many blocks + if (dist > 9000) return; // FirstPassthroughBlock says piston can't push anything, bail out - AddDir(pistx, pisty, pistz, pistonMeta & 7, dist + 1) + AddDir(pistx, pisty, pistz, pistonMeta & 7, dist + 1) //Get the coords of the air / breakable block in the line, dist+1 because of coords BLOCKTYPE currBlock; NIBBLETYPE currMeta; m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currMeta); @@ -101,37 +103,33 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz ) cBlockHandler * Handler = BlockHandler(currBlock); if (Handler->DoesDropOnUnsuitable()) { - Handler->DropBlock(m_World, NULL, pistx, pisty, pistz); + Handler->DropBlock(m_World, NULL, pistx, pisty, pistz); //If block is breakable, drop it } } - int oldx = pistx, oldy = pisty, oldz = pistz; + int oldx = pistx, oldy = pisty, oldz = pistz; //Make a second set of coord vars along with the originals NIBBLETYPE currBlockMeta; - for (int i = dist + 1; i > 0; i--) + if (dist != 0) //Check for single block being pushed - for loop doesn't catch it in time and breaks stuffz { - AddDir(pistx, pisty, pistz, pistonMeta & 7, -1) - m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currBlockMeta); - m_World->SetBlock( oldx, oldy, oldz, currBlock, currBlockMeta); - oldx = pistx; - oldy = pisty; - oldz = pistz; + for (int i = dist + 1; i > 1; i--) //Decrement from the dropped breakable block to two further than the piston (one further will be future extension) + { + AddDir(pistx, pisty, pistz, pistonMeta & 7, -1) //Move one set of coords one back from breakable dropped block + m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currBlockMeta); //Get the block + m_World->SetBlock( oldx, oldy, oldz, currBlock, currBlockMeta); //Set the block at the location of the original coords + oldx = pistx; //Shift the selectors down a block and repeat + oldy = pisty; + oldz = pistz; + } } - m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, E_BLOCK_PISTON); - m_World->BroadcastSoundEffect("tile.piston.out", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f); - m_World->FastSetBlock( pistx, pisty, pistz, pistonBlock, pistonMeta | 0x8 ); int extx = pistx; int exty = pisty; int extz = pistz; - AddDir(extx, exty, extz, pistonMeta & 7, 1) - - // TODO: This code needs replacing - // Sleeping here will play the piston animation on the client; however, it will block the entire server - // for the 100 ms, effectively dropping 2 game ticks per piston. This is very bad - // This needs to be handled using delayed scheduled tasks instead - cSleep::MilliSleep(100); - - m_World->SetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, isSticky + pistonMeta & 7); + AddDir(pistx, pisty, pistz, pistonMeta & 7, -1) //Move back one block to the piston base + m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, E_BLOCK_PISTON); //Set the base + m_World->BroadcastSoundEffect("tile.piston.out", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f); + m_World->FastSetBlock( pistx, pisty, pistz, pistonBlock, pistonMeta | 0x8 ); + m_World->SetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, isSticky + pistonMeta); //Set the arm } @@ -150,9 +148,9 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz ) } m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), E_BLOCK_PISTON); m_World->BroadcastSoundEffect("tile.piston.in", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f); - m_World->FastSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8)); + m_World->FastSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8)); //Set the base - AddDir(pistx, pisty, pistz, pistonMeta & 7, 1) + AddDir(pistx, pisty, pistz, pistonMeta & 7, 1) //Move forwards to the extension coord if (m_World->GetBlock(pistx, pisty, pistz) != E_BLOCK_PISTON_EXTENSION) { LOGD("%s: Piston without an extension?", __FUNCTION__); @@ -162,36 +160,27 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz ) if (pistonBlock == E_BLOCK_STICKY_PISTON) { int tempx = pistx, tempy = pisty, tempz = pistz; - AddDir( tempx, tempy, tempz, pistonMeta & 7, 1 ) + AddDir( tempx, tempy, tempz, pistonMeta & 7, 1 ) //Move forward to the block being pulled BLOCKTYPE tempblock; NIBBLETYPE tempmeta; - m_World->GetBlockTypeMeta(tempx, tempy, tempz, tempblock, tempmeta); + m_World->GetBlockTypeMeta(tempx, tempy, tempz, tempblock, tempmeta); //Check for pullable-ness if ( (tempblock == E_BLOCK_OBSIDIAN) || (tempblock == E_BLOCK_BEDROCK) || - (tempblock == E_BLOCK_PISTON_EXTENSION) + (tempblock == E_BLOCK_PISTON_EXTENSION) || + (g_BlockPistonBreakable[tempblock]) || + ((tempmeta & 0x8) != 0x0 ) ) { // These cannot be moved by the sticky piston, bail out return; } - - // TODO: This code needs replacing - // Sleeping here will play the piston animation on the client; however, it will block the entire server - // for the 100 ms, effectively dropping 2 game ticks per piston. This is very bad - // This needs to be handled using delayed scheduled tasks instead - cSleep::MilliSleep(100); m_World->SetBlock(pistx, pisty, pistz, tempblock, tempmeta); m_World->SetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0); } else { - // TODO: This code needs replacing - // Sleeping here will play the piston animation on the client; however, it will block the entire server - // for the 100 ms, effectively dropping 2 game ticks per piston. This is very bad - // This needs to be handled using delayed scheduled tasks instead - cSleep::MilliSleep(100); m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0); } -- cgit v1.2.3