summaryrefslogtreecommitdiffstats
path: root/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.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/PoweredRailHandler.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/PoweredRailHandler.h')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h
index c420251b1..b949db98b 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h
+++ b/src/Simulator/IncrementalRedstoneSimulator/PoweredRailHandler.h
@@ -25,7 +25,7 @@ namespace PoweredRailHandler
}
}
- 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_QueryBlockType);
@@ -33,13 +33,13 @@ namespace PoweredRailHandler
const auto Offset = GetPoweredRailAdjacentXZCoordinateOffset(Meta);
if (((Offset + a_Position) == a_QueryPosition) || ((-Offset + a_Position) == a_QueryPosition))
{
- auto Power = DataForChunk(a_Chunk).GetCachedPowerData(a_Position).PowerLevel;
- return (Power <= 7) ? 0 : --Power;
+ const auto Power = DataForChunk(a_Chunk).GetCachedPowerData(a_Position);
+ return (Power <= 7) ? 0 : (Power - 1);
}
return 0;
}
- inline void Update(cChunk & a_Chunk, cChunk & CurrentlyTickingChunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, PoweringData a_PoweringData)
+ inline void Update(cChunk & a_Chunk, cChunk & CurrentlyTickingChunk, Vector3i a_Position, BLOCKTYPE a_BlockType, NIBBLETYPE a_Meta, const PowerLevel Power)
{
// LOGD("Evaluating tracky the rail (%d %d %d)", a_Position.x, a_Position.y, a_Position.z);
@@ -58,10 +58,10 @@ namespace PoweredRailHandler
case E_BLOCK_ACTIVATOR_RAIL:
case E_BLOCK_POWERED_RAIL:
{
- auto Offset = GetPoweredRailAdjacentXZCoordinateOffset(a_Meta);
- if (a_PoweringData != DataForChunk(a_Chunk).ExchangeUpdateOncePowerData(a_Position, a_PoweringData))
+ const auto Offset = GetPoweredRailAdjacentXZCoordinateOffset(a_Meta);
+ if (Power != DataForChunk(a_Chunk).ExchangeUpdateOncePowerData(a_Position, Power))
{
- a_Chunk.SetMeta(a_Position, (a_PoweringData.PowerLevel == 0) ? (a_Meta & 0x07) : (a_Meta | 0x08));
+ a_Chunk.SetMeta(a_Position, (Power == 0) ? (a_Meta & 0x07) : (a_Meta | 0x08));
UpdateAdjustedRelative(a_Chunk, CurrentlyTickingChunk, a_Position, Offset);
UpdateAdjustedRelative(a_Chunk, CurrentlyTickingChunk, a_Position, -Offset);