Reverted 411c69b

src/Blocks/BlockButton.h

@@ -1,7 +1,7 @@
#pragma once

#include "BlockHandler.h"
#include "Chunk.h"
#include "ChunkInterface.h"
#include "MetaRotator.h"

src/Blocks/BlockLever.h

@@ -2,6 +2,7 @@

#include "BlockHandler.h"
#include "MetaRotator.h"
#include "WorldInterface.h"

src/Chunk.cpp

@@ -92,7 +92,6 @@ cChunk::cChunk(
	m_NeighborZP(a_NeighborZP),
	m_WaterSimulatorData(a_World->GetWaterSimulator()->CreateChunkData()),
	m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData()),
	m_RedstoneSimulatorData(NULL),
	m_AlwaysTicked(0)
{
	if (a_NeighborXM != NULL)
@@ -161,8 +160,6 @@ cChunk::~cChunk()
	m_WaterSimulatorData = NULL;
	delete m_LavaSimulatorData;
	m_LavaSimulatorData = NULL;
	delete m_RedstoneSimulatorData;
	m_RedstoneSimulatorData = NULL;
}


@@ -1370,9 +1367,9 @@ void cChunk::CreateBlockEntities(void)

void cChunk::WakeUpSimulators(void)
{
	cSimulator<cChunk, cWorld> * WaterSimulator = m_World->GetWaterSimulator();
	cSimulator<cChunk, cWorld> * LavaSimulator  = m_World->GetLavaSimulator();
	cSimulator<cChunk, cWorld> * RedstoneSimulator = m_World->GetRedstoneSimulator();
	cSimulator * WaterSimulator = m_World->GetWaterSimulator();
	cSimulator * LavaSimulator  = m_World->GetLavaSimulator();
	cSimulator * RedstoneSimulator = m_World->GetRedstoneSimulator();
	int BaseX = m_PosX * cChunkDef::Width;
	int BaseZ = m_PosZ * cChunkDef::Width;
	for (int x = 0; x < Width; x++)

src/Chunk.h

@@ -4,15 +4,12 @@
#include "Entities/Entity.h"
#include "ChunkDef.h"
#include "ChunkData.h"
#include "ChunkMap.h"

#include "Simulator/FireSimulator.h"
#include "Simulator/SandSimulator.h"
#include "Simulator/IncrementalRedstoneSimulator.h"

#include "Blocks/GetHandlerCompileTimeTemplate.h"

#include "ChunkMap.h"



namespace Json
@@ -33,7 +30,7 @@ class cChunkMap;
class cBeaconEntity;
class cBoundingBox;
class cChestEntity;
class cCHunkDataCallback;
class cChunkDataCallback;
class cCommandBlockEntity;
class cDispenserEntity;
class cFurnaceEntity;
@@ -71,6 +68,7 @@ typedef cItemCallback<cRedstonePoweredEntity> cRedstonePoweredCallback;
class cChunk :
	public cChunkDef  // The inheritance is "misused" here only to inherit the functions and constants defined in cChunkDef
{

public:
	/** Represents the presence state of the chunk */
	enum ePresence
@@ -420,7 +418,7 @@ class cChunk :
	cFluidSimulatorData *     GetLavaSimulatorData (void) { return m_LavaSimulatorData; }
	cSandSimulatorChunkData & GetSandSimulatorData (void) { return m_SandSimulatorData; }

	cRedstoneSimulatorChunkData * GetRedstoneSimulatorData(void) { return m_RedstoneSimulatorData; }
	cIncrementalRedstoneSimulator::cIncrementalRedstoneSimulatorChunkData * GetRedstoneSimulatorData(void) { return &m_IncrementalRedstoneSimulatorChunkData; }
	bool IsRedstoneDirty(void) const { return m_IsRedstoneDirty; }
	void SetIsRedstoneDirty(bool a_Flag) { m_IsRedstoneDirty = a_Flag; }

@@ -504,9 +502,7 @@ class cChunk :
	cFluidSimulatorData *   m_WaterSimulatorData;
	cFluidSimulatorData *   m_LavaSimulatorData;
	cSandSimulatorChunkData m_SandSimulatorData;

	cRedstoneSimulatorChunkData * m_RedstoneSimulatorData;

	cIncrementalRedstoneSimulator::cIncrementalRedstoneSimulatorChunkData m_IncrementalRedstoneSimulatorChunkData;

	/** Indicates if simulate-once blocks should be updated by the redstone simulator */
	bool m_IsRedstoneDirty;

src/Simulator/FireSimulator.h

@@ -16,7 +16,7 @@ it progresses to the next step (blockmeta++). This value is updated if a neighbo
The simulator reads its parameters from the ini file given to the constructor.
*/
class cFireSimulator :
	public cSimulator<cChunk, cWorld>
	public cSimulator
{
public:
	cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);

src/Simulator/FluidSimulator.h

@@ -37,9 +37,9 @@ class cFluidSimulatorData


class cFluidSimulator :
	public cSimulator<cChunk, cWorld>
	public cSimulator
{
	typedef cSimulator<cChunk, cWorld> super;
	typedef cSimulator super;
	
public:
	cFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid);