2 files changed, 17 insertions, 9 deletions

diff --git a/source/Server.cpp b/source/Server.cpp
index 9c1e06c81..dd18f8d3d 100644
--- a/source/Server.cpp
+++ b/source/Server.cpp
@@ -75,7 +75,7 @@ void cServer::cTickThread::Execute(void)
 {
 	cTimer Timer;
 
-	long long msPerTick = 50;	// TODO - Put this in server config file
+	long long msPerTick = 50;
 	long long LastTime = Timer.GetNowTime();
 
 	while (!m_ShouldTerminate)
diff --git a/source/World.cpp b/source/World.cpp
index 8f9b3924f..053eaedc7 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -12,6 +12,7 @@
 #include "Root.h"
 #include "../iniFile/iniFile.h"
 #include "ChunkMap.h"
+#include "OSSupport/Timer.h"
 
 // Simulators:
 #include "Simulator/SimulatorManager.h"
@@ -206,18 +207,25 @@ cWorld::cTickThread::cTickThread(cWorld & a_World) :
 
 void cWorld::cTickThread::Execute(void)
 {
-	const int ClocksPerTick = CLOCKS_PER_SEC / 20;
-	clock_t LastTime = clock();
+	cTimer Timer;
+
+	long long msPerTick = 50;
+	long long LastTime = Timer.GetNowTime();
+
 	while (!m_ShouldTerminate)
 	{
-		clock_t Start = clock();
-		m_World.Tick((float)(1000 * (Start - LastTime)) / CLOCKS_PER_SEC);
-		clock_t Now = clock();
-		if (Now - Start < ClocksPerTick)
+		long long NowTime = Timer.GetNowTime();
+		float DeltaTime = (float)(NowTime - LastTime);
+		m_World.Tick(DeltaTime);
+		long long TickTime = Timer.GetNowTime() - NowTime;
+		
+		if (TickTime < msPerTick)
 		{
-			cSleep::MilliSleep(1000 * (ClocksPerTick - (Now - Start)) / CLOCKS_PER_SEC);
+			// Stretch tick time until it's at least msPerTick
+			cSleep::MilliSleep((unsigned int)(msPerTick - TickTime));
 		}
-		LastTime = Start;
+
+		LastTime = NowTime;
 	}
 }