summaryrefslogtreecommitdiffstats
path: root/source/Simulator/RedstoneSimulator.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-28 08:42:45 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-28 08:42:45 +0100
commit2588f5a605d135bc01996f3a685444dfb37978f8 (patch)
tree4aee764dd164860d546d1e9269c8ee2967810a90 /source/Simulator/RedstoneSimulator.h
parentFixed a copypasta error from rev 1224 (diff)
downloadcuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.gz
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.bz2
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.lz
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.xz
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.tar.zst
cuberite-2588f5a605d135bc01996f3a685444dfb37978f8.zip
Diffstat (limited to '')
-rw-r--r--source/Simulator/RedstoneSimulator.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/Simulator/RedstoneSimulator.h b/source/Simulator/RedstoneSimulator.h
index 0b0333164..df5874d07 100644
--- a/source/Simulator/RedstoneSimulator.h
+++ b/source/Simulator/RedstoneSimulator.h
@@ -18,7 +18,7 @@ public:
virtual void Simulate( float a_Dt ) override;
virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return true; }
- virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ) override;
+ virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override;
enum eRedstoneDirection
{
@@ -56,7 +56,7 @@ private:
void SetRepeater(const Vector3i & a_Position, int a_Ticks, bool a_bPowerOn);
- virtual void AddBlock(int a_X, int a_Y, int a_Z) {}
+ virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override {}
void HandleChange( const Vector3i & a_BlockPos );
BlockList RemoveCurrent( const Vector3i & a_BlockPos );
@@ -77,6 +77,7 @@ private:
void RefreshTorchesAround( const Vector3i & a_BlockPos );
+ // TODO: The entire simulator is synchronized, no need to lock data structures; remove this
cCriticalSection m_CS;
};