From 6c47f46c31813836efa5af199766aff23fed9dd3 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Tue, 28 Jul 2020 00:13:07 +0100 Subject: Ensure updating relatives calls the correct base case * Fixed recursive base unintentionally scheduling the origin position for an update because it called the wrong function --- src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h') diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h index fec38b14d..79c410265 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h @@ -53,7 +53,7 @@ protected: } template - static void UpdateAdjustedRelatives(cChunk & From, cChunk & To, const Vector3i Position) + static void UpdateAdjustedRelative(cChunk & From, cChunk & To, const Vector3i Position) { DataForChunk(To).WakeUp(cIncrementalRedstoneSimulatorChunkData::RebaseRelativePosition(From, To, Position)); } @@ -70,7 +70,7 @@ protected: } template - static void InvokeForAdjustedRelatives(SourceCallback Callback, Vector3i Position, const ArrayType & Relative, const ArrayTypes &... Relatives) + static void InvokeForAdjustedRelatives(SourceCallback Callback, const Vector3i Position, const ArrayType & Relative, const ArrayTypes &... Relatives) { for (const auto Offset : Relative) { @@ -104,11 +104,11 @@ protected: private: - static void UpdateAdjustedRelatives(cVector3iArray &, Vector3i) + static void UpdateAdjustedRelatives(cChunk &, cChunk &, const Vector3i) { } - static void InvokeForAdjustedRelatives(SourceCallback, Vector3i) + static void InvokeForAdjustedRelatives(SourceCallback, const Vector3i) { } }; -- cgit v1.2.3