flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Revert "Made redstone handlers static"

This commit is contained in:
Lukas Pioch 2016-07-01 21:51:18 +02:00 committed by Mattes D
parent 6310d0d286
commit 2b78fd6227
2 changed files with 31 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp
View File

@ -30,122 +30,62 @@
cRedstoneHandler * cIncrementalRedstoneSimulator::CreateComponent(cWorld & a_World, BLOCKTYPE a_BlockType, cIncrementalRedstoneSimulatorChunkData * a_Data) std::unique_ptr<cRedstoneHandler> cIncrementalRedstoneSimulator::CreateComponent(cWorld & a_World, BLOCKTYPE a_BlockType, cIncrementalRedstoneSimulatorChunkData * a_Data)
{ {
switch (a_BlockType) switch (a_BlockType)
{ {
case E_BLOCK_ACTIVATOR_RAIL: case E_BLOCK_ACTIVATOR_RAIL:
case E_BLOCK_DETECTOR_RAIL: case E_BLOCK_DETECTOR_RAIL:
case E_BLOCK_POWERED_RAIL: case E_BLOCK_POWERED_RAIL: return cpp14::make_unique<cPoweredRailHandler>(a_World);
{
static cPoweredRailHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_ACTIVE_COMPARATOR: case E_BLOCK_ACTIVE_COMPARATOR:
case E_BLOCK_INACTIVE_COMPARATOR: case E_BLOCK_INACTIVE_COMPARATOR: return cpp14::make_unique<cRedstoneComparatorHandler>(a_World);
{
static cRedstoneComparatorHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_DISPENSER: case E_BLOCK_DISPENSER:
case E_BLOCK_DROPPER: case E_BLOCK_DROPPER: return cpp14::make_unique<cDropSpenserHandler>(a_World);
{
static cDropSpenserHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE: case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE:
case E_BLOCK_STONE_PRESSURE_PLATE: case E_BLOCK_STONE_PRESSURE_PLATE:
case E_BLOCK_WOODEN_PRESSURE_PLATE: case E_BLOCK_WOODEN_PRESSURE_PLATE: return cpp14::make_unique<cPressurePlateHandler>(a_World);
{
static cPressurePlateHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_FENCE_GATE: case E_BLOCK_FENCE_GATE:
case E_BLOCK_IRON_TRAPDOOR: case E_BLOCK_IRON_TRAPDOOR:
case E_BLOCK_TRAPDOOR: case E_BLOCK_TRAPDOOR: return cpp14::make_unique<cSmallGateHandler>(a_World);
{
static cSmallGateHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_REDSTONE_LAMP_OFF: case E_BLOCK_REDSTONE_LAMP_OFF:
case E_BLOCK_REDSTONE_LAMP_ON: case E_BLOCK_REDSTONE_LAMP_ON: return cpp14::make_unique<cRedstoneLampHandler>(a_World);
{
static cRedstoneLampHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_REDSTONE_REPEATER_OFF: case E_BLOCK_REDSTONE_REPEATER_OFF:
case E_BLOCK_REDSTONE_REPEATER_ON: case E_BLOCK_REDSTONE_REPEATER_ON: return cpp14::make_unique<cRedstoneRepeaterHandler>(a_World);
{
static cRedstoneRepeaterHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_REDSTONE_TORCH_OFF: case E_BLOCK_REDSTONE_TORCH_OFF:
case E_BLOCK_REDSTONE_TORCH_ON: case E_BLOCK_REDSTONE_TORCH_ON: return cpp14::make_unique<cRedstoneTorchHandler>(a_World);
{
static cRedstoneTorchHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_PISTON: case E_BLOCK_PISTON:
case E_BLOCK_STICKY_PISTON: case E_BLOCK_STICKY_PISTON: return cpp14::make_unique<cPistonHandler>(a_World);
{
static cPistonHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_LEVER: case E_BLOCK_LEVER:
case E_BLOCK_STONE_BUTTON: case E_BLOCK_STONE_BUTTON:
case E_BLOCK_WOODEN_BUTTON: case E_BLOCK_WOODEN_BUTTON: return cpp14::make_unique<cRedstoneToggleHandler>(a_World);
{
static cRedstoneToggleHandler ComponentHandler(a_World); case E_BLOCK_BLOCK_OF_REDSTONE: return cpp14::make_unique<cRedstoneBlockHandler>(a_World);
return &ComponentHandler; case E_BLOCK_COMMAND_BLOCK: return cpp14::make_unique<cCommandBlockHandler>(a_World);
} case E_BLOCK_NOTE_BLOCK: return cpp14::make_unique<cNoteBlockHandler>(a_World);
case E_BLOCK_BLOCK_OF_REDSTONE: case E_BLOCK_REDSTONE_WIRE: return cpp14::make_unique<cRedstoneWireHandler>(a_World);
{ case E_BLOCK_TNT: return cpp14::make_unique<cTNTHandler>(a_World);
static cRedstoneBlockHandler ComponentHandler(a_World); case E_BLOCK_TRAPPED_CHEST: return cpp14::make_unique<cTrappedChestHandler>(a_World);
return &ComponentHandler; case E_BLOCK_TRIPWIRE_HOOK: return cpp14::make_unique<cTripwireHookHandler>(a_World);
}
case E_BLOCK_COMMAND_BLOCK:
{
static cCommandBlockHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_NOTE_BLOCK:
{
static cNoteBlockHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_REDSTONE_WIRE:
{
static cRedstoneWireHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_TNT:
{
static cTNTHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_TRAPPED_CHEST:
{
static cTrappedChestHandler ComponentHandler(a_World);
return &ComponentHandler;
}
case E_BLOCK_TRIPWIRE_HOOK:
{
static cTripwireHookHandler ComponentHandler(a_World);
return &ComponentHandler;
}
default: default:
{ {
if (cBlockDoorHandler::IsDoorBlockType(a_BlockType)) if (cBlockDoorHandler::IsDoorBlockType(a_BlockType))
{ {
static cDoorHandler ComponentHandler(a_World); return cpp14::make_unique<cDoorHandler>(a_World);
return &ComponentHandler;
} }
if (cBlockInfo::FullyOccupiesVoxel(a_BlockType)) if (cBlockInfo::FullyOccupiesVoxel(a_BlockType))
{ {
static cSolidBlockHandler ComponentHandler(a_World); return cpp14::make_unique<cSolidBlockHandler>(a_World);
return &ComponentHandler;
} }
return nullptr; return nullptr;
} }

4
src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h
View File

@ -18,8 +18,6 @@ public:
{ {
} }
cIncrementalRedstoneSimulator(const cIncrementalRedstoneSimulator & a_Simulator) = delete;
virtual void Simulate(float a_dt) override; virtual void Simulate(float a_dt) override;
virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override {} virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override {}
@ -160,7 +158,7 @@ public:
} }
cIncrementalRedstoneSimulatorChunkData * GetChunkData() { return &m_Data; } cIncrementalRedstoneSimulatorChunkData * GetChunkData() { return &m_Data; }
static cRedstoneHandler * CreateComponent(cWorld & a_World, BLOCKTYPE a_BlockType, cIncrementalRedstoneSimulatorChunkData * a_Data); static std::unique_ptr<cRedstoneHandler> CreateComponent(cWorld & a_World, BLOCKTYPE a_BlockType, cIncrementalRedstoneSimulatorChunkData * a_Data);
private: private: