From 49c443896dcac8c4eaf08c4024e8bd2366ad899a Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sat, 2 Sep 2017 10:45:06 +0300 Subject: Revert "Replace ItemCallbacks with lambdas (#3948)" This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. --- src/LineBlockTracer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/LineBlockTracer.cpp') diff --git a/src/LineBlockTracer.cpp b/src/LineBlockTracer.cpp index e194ae653..471d9e13b 100644 --- a/src/LineBlockTracer.cpp +++ b/src/LineBlockTracer.cpp @@ -199,12 +199,12 @@ bool cLineBlockTracer::Trace(double a_StartX, double a_StartY, double a_StartZ, m_DiffY = m_EndY - m_StartY; m_DiffZ = m_EndZ - m_StartZ; - // The actual trace is handled with ChunkMapCS locked by calling our ChunkCallback for the specified chunk + // The actual trace is handled with ChunkMapCS locked by calling our Item() for the specified chunk int BlockX = FloorC(m_StartX); int BlockZ = FloorC(m_StartZ); int ChunkX, ChunkZ; cChunkDef::BlockToChunk(BlockX, BlockZ, ChunkX, ChunkZ); - return m_World->DoWithChunk(ChunkX, ChunkZ, [this](cChunk & a_Chunk) { return ChunkCallback(&a_Chunk); }); + return m_World->DoWithChunk(ChunkX, ChunkZ, *this); } @@ -308,7 +308,7 @@ bool cLineBlockTracer::MoveToNextBlock(void) -bool cLineBlockTracer::ChunkCallback(cChunk * a_Chunk) +bool cLineBlockTracer::Item(cChunk * a_Chunk) { ASSERT((m_CurrentY >= 0) && (m_CurrentY < cChunkDef::Height)); // This should be provided by FixStartAboveWorld() / FixStartBelowWorld() -- cgit v1.2.3