From c11e252e27605fd8d5ed4e9e3ba0cd0563a5ee50 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 19 Aug 2013 19:44:22 +0100 Subject: Fixed piston animations... ...for the third (and hopefully last) time. --- source/Piston.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/Piston.cpp b/source/Piston.cpp index d6ea01803..0af365b17 100644 --- a/source/Piston.cpp +++ b/source/Piston.cpp @@ -98,7 +98,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz) { AddDir(pistx, pisty, pistz, pistonMeta, -1); m_World->GetBlockTypeMeta(pistx, pisty, pistz, currBlock, currBlockMeta); - m_World->SetBlock( oldx, oldy, oldz, currBlock, currBlockMeta); + m_World->QueueSetBlock( oldx, oldy, oldz, currBlock, currBlockMeta, 320); oldx = pistx; oldy = pisty; oldz = pistz; @@ -113,7 +113,7 @@ void cPiston::ExtendPiston(int pistx, int pisty, int pistz) m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, pistonBlock); 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, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0)); + m_World->QueueSetBlock(extx, exty, extz, E_BLOCK_PISTON_EXTENSION, pistonMeta | (IsSticky(pistonBlock) ? 8 : 0), 320); } @@ -133,7 +133,7 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz ) m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), pistonBlock); m_World->BroadcastSoundEffect("tile.piston.in", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f); - m_World->SetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8)); + m_World->QueueSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8), 320); // Check the extension: @@ -155,18 +155,18 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz ) if (CanPull(tempBlock, tempMeta)) { // Pull the block - m_World->SetBlock(pistx, pisty, pistz, tempBlock, tempMeta); - m_World->SetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0); + m_World->QueueSetBlock(pistx, pisty, pistz, tempBlock, tempMeta, 320); + m_World->QueueSetBlock(tempx, tempy, tempz, E_BLOCK_AIR, 0, 320); } else { // Retract without pulling - m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0); + m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 320); } } else { - m_World->SetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0); + m_World->QueueSetBlock(pistx, pisty, pistz, E_BLOCK_AIR, 0, 320); } } -- cgit v1.2.3