1 files changed, 11 insertions, 17 deletions
diff --git a/src/World.cpp b/src/World.cpp
index ff333ad2a..65f607ee0 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -11,7 +11,6 @@
 #include "inifile/iniFile.h"
 #include "ChunkMap.h"
 #include "Generating/ChunkDesc.h"
-#include "OSSupport/Timer.h"
 #include "SetChunkData.h"
 
 // Serializers
@@ -45,7 +44,6 @@
 #include "MobCensus.h"
 #include "MobSpawner.h"
 
-#include "MersenneTwister.h"
 #include "Generating/Trees.h"
 #include "Bindings/PluginManager.h"
 #include "Blocks/BlockHandler.h"
@@ -110,7 +108,7 @@ protected:
 			// Wait for 2 sec, but be "reasonably wakeable" when the thread is to finish
 			for (int i = 0; i < 20; i++)
 			{
-				cSleep::MilliSleep(100);
+				std::this_thread::sleep_for(std::chrono::milliseconds(100));
 				if (m_ShouldTerminate)
 				{
 					return;
@@ -160,7 +158,7 @@ protected:
 			// Wait for 2 sec, but be "reasonably wakeable" when the thread is to finish
 			for (int i = 0; i < 20; i++)
 			{
-				cSleep::MilliSleep(100);
+				std::this_thread::sleep_for(std::chrono::milliseconds(100));
 				if (m_ShouldTerminate)
 				{
 					return;
@@ -168,8 +166,7 @@ protected:
 			}
 		}  // for (-ever)
 	}
-	
-} ;
+};
 
 
 
@@ -202,23 +199,20 @@ cWorld::cTickThread::cTickThread(cWorld & a_World) :
 
 void cWorld::cTickThread::Execute(void)
 {
-	cTimer Timer;
-
-	const Int64 msPerTick = 50;
-	Int64 LastTime = Timer.GetNowTime();
+	auto LastTime = std::chrono::steady_clock::now();
+	static const auto msPerTick = std::chrono::milliseconds(50);
+	auto TickTime = std::chrono::steady_clock::duration(50);
 
-	Int64 TickDuration = 50;
 	while (!m_ShouldTerminate)
 	{
-		Int64 NowTime = Timer.GetNowTime();
-		float DeltaTime = (float)(NowTime - LastTime);
-		m_World.Tick(DeltaTime, (int)TickDuration);
-		TickDuration = Timer.GetNowTime() - NowTime;
+		auto NowTime = std::chrono::steady_clock::now();
+		m_World.Tick(std::chrono::duration_cast<std::chrono::milliseconds>(NowTime - LastTime).count(), std::chrono::duration_cast<std::chrono::duration<int>>(TickTime).count());
+		TickTime = std::chrono::steady_clock::now() - NowTime;
 		
-		if (TickDuration < msPerTick)
+		if (TickTime < msPerTick)
 		{
 			// Stretch tick time until it's at least msPerTick
-			cSleep::MilliSleep((unsigned int)(msPerTick - TickDuration));
+			std::this_thread::sleep_for(msPerTick - TickTime);
 		}
 
 		LastTime = NowTime;