From 2588f5a605d135bc01996f3a685444dfb37978f8 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 28 Feb 2013 07:42:45 +0000 Subject: Simulators now have direct access to the cChunk object in the WakeUp() call git-svn-id: http://mc-server.googlecode.com/svn/trunk@1227 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Simulator/RedstoneSimulator.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/Simulator/RedstoneSimulator.h') 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; }; -- cgit v1.2.3