diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-02-01 00:17:41 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-02-01 00:17:41 +0100 |
| commit | 25ec7750aac9800bec83a844020a6eeda5cd4d74 (patch) | |
| tree | 1820a0856969583238d85b2a68d299e55807f951 /src/Blocks/BlockPiston.cpp | |
| parent | Changed it so std was actually set to c++11 in clang not gcc on OS X (diff) | |
| download | cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.gz cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.bz2 cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.lz cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.xz cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.tar.zst cuberite-25ec7750aac9800bec83a844020a6eeda5cd4d74.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockPiston.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index 88259d96e..0b7dd5863 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/src/Blocks/BlockPiston.cpp @@ -33,18 +33,18 @@ cBlockPistonHandler::cBlockPistonHandler(BLOCKTYPE a_BlockType) -void cBlockPistonHandler::OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) +void cBlockPistonHandler::OnDestroyed(cChunkInterface * a_ChunkInterface, cWorldInterface * a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) { - NIBBLETYPE OldMeta = a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); + NIBBLETYPE OldMeta = a_ChunkInterface->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ); int newX = a_BlockX; int newY = a_BlockY; int newZ = a_BlockZ; AddPistonDir(newX, newY, newZ, OldMeta & ~(8), 1); - if (a_World->GetBlock(newX, newY, newZ) == E_BLOCK_PISTON_EXTENSION) + if (a_ChunkInterface->GetBlock(newX, newY, newZ) == E_BLOCK_PISTON_EXTENSION) { - a_World->SetBlock(newX, newY, newZ, E_BLOCK_AIR, 0); + a_ChunkInterface->SetBlock(a_WorldInterface, newX, newY, newZ, E_BLOCK_AIR, 0); } } @@ -53,7 +53,7 @@ void cBlockPistonHandler::OnDestroyed(cWorld * a_World, int a_BlockX, int a_Bloc bool cBlockPistonHandler::GetPlacementBlockTypeMeta( - cWorld * a_World, cPlayer * a_Player, + cChunkInterface * a_ChunkInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta |