From 5b62c4c3145c08b093521e42c565922fa85de4ad Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 26 Jun 2015 17:24:51 -0500 Subject: Reorganised the redstone simulator -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved --- src/World.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/World.cpp') diff --git a/src/World.cpp b/src/World.cpp index 3f4e8dfea..47a4e9303 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -34,8 +34,8 @@ #include "Simulator/FireSimulator.h" #include "Simulator/NoopFluidSimulator.h" #include "Simulator/NoopRedstoneSimulator.h" +#include "Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.h" #include "Simulator/SandSimulator.h" -#include "Simulator/IncrementalRedstoneSimulator.h" #include "Simulator/VanillaFluidSimulator.h" #include "Simulator/VaporizeFluidSimulator.h" @@ -991,8 +991,6 @@ void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_La TickWeather(static_cast(a_Dt.count())); - m_ChunkMap->FastSetQueuedBlocks(); - if (m_WorldAge - m_LastSave > std::chrono::minutes(5)) // Save each 5 minutes { SaveAllChunks(); @@ -3626,7 +3624,7 @@ cRedstoneSimulator * cWorld::InitializeRedstoneSimulator(cIniFile & a_IniFile) res = new cRedstoneNoopSimulator(*this); } - m_SimulatorManager->RegisterSimulator(res, 1); + m_SimulatorManager->RegisterSimulator(res, 2 /* Two game ticks is a redstone tick */); return res; } -- cgit v1.2.3