1
0

Fixed WorldTickThread reporting wrong time durations for each tick.

This had caused food eating to fail and players unable to collect pickups on Linux.
This commit is contained in:
madmaxoft 2013-08-19 22:23:25 +02:00
parent 8289ac8ba7
commit fdbe835131
2 changed files with 17 additions and 9 deletions

View File

@ -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)

View File

@ -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;
}
}