summaryrefslogtreecommitdiffstats
path: root/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-08-20 21:04:28 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-08-21 01:50:09 +0200
commitd8c8d0124da12587bbaf52992f7a8d2e0b010544 (patch)
tree305983c82fdb55ec7f9bc37cda1b54304f4a0ecf /src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h
parentcChunk's deleted copy constructor needs const (diff)
downloadcuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.tar
cuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.tar.gz
cuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.tar.bz2
cuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.tar.lz
cuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.tar.xz
cuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.tar.zst
cuberite-d8c8d0124da12587bbaf52992f7a8d2e0b010544.zip
Diffstat (limited to 'src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h
index 4806a0367..ce318e0b1 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h
+++ b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h
@@ -11,7 +11,7 @@ namespace DoorHandler
{
// "Doormammu, I've come to bargain"
- inline unsigned char GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked)
+ inline PowerLevel GetPowerDeliveredToPosition(const cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_BlockType, Vector3i a_QueryPosition, BLOCKTYPE a_QueryBlockType, bool IsLinked)
{
UNUSED(a_Chunk);
UNUSED(a_Position);
@@ -22,7 +22,7 @@ namespace DoorHandler
return 0;
}
- inline void Update(cChunk & a_Chunk, cChunk &, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData)
+ inline void Update(cChunk & a_Chunk, cChunk &, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PowerLevel Power)
{
// LOGD("Evaluating dori the door (%d %d %d)", a_Position.x, a_Position.y, a_Position.z);
@@ -37,10 +37,10 @@ namespace DoorHandler
RedstoneHandler::ForValidSourcePositions(a_Chunk, TopPosition, a_BlockType, a_Meta, Callback);
// Factor in what the upper half is getting:
- a_PoweringData = std::max(a_PoweringData, Callback.Power);
+ Power = std::max(Power, Callback.Power);
cChunkInterface ChunkInterface(a_Chunk.GetWorld()->GetChunkMap());
- const bool ShouldBeOpen = a_PoweringData.PowerLevel != 0;
+ const bool ShouldBeOpen = Power != 0;
const auto AbsolutePosition = cChunkDef::RelativeToAbsolute(a_Position, a_Chunk.GetPos());
const bool IsOpen = cBlockDoorHandler::IsOpen(ChunkInterface, AbsolutePosition);