Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some hacks to paper over the time travel bug. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9257 4a71c877-e1ca-e34f-864e-861f7616d084
master
Guangcong Luo 2010-01-16 22:26:45 +00:00 committed by Git SVN Gateway
parent 1f20309350
commit dabc178157
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/gamelib/gtime.c
View File

@ -102,13 +102,13 @@ UDWORD getStaticTimeValueRange(UDWORD tickFrequency, UDWORD requiredRange)
void gameTimeUpdate(void)
{
unsigned int currTime = SDL_GetTicks();
unsigned long long newTime;
long long newTime;
// Do not update the game time if gameTimeStop has been called
if (stopCount == 0)
{
// Calculate the new game time
newTime = ( currTime - baseTime ) * modifier + timeOffset;
newTime = (long long)(( currTime - baseTime ) * (double)modifier) + timeOffset;
ASSERT(newTime >= gameTime, "Time travel is occurring!");
if (newTime < gameTime)
@ -166,14 +166,14 @@ void gameTimeUpdate(void)
// This is a temporary solution
// Commented out in trunk so that perhaps we can track down and fix this bug
/* if (gameTime > baseTime + 1<<18)
{
timeOffset = gameTime;
timeOffset2 = gameTime2;
if (gameTime > baseTime + 1<<18)
{
timeOffset = gameTime;
timeOffset2 = gameTime2;
baseTime = SDL_GetTicks();
baseTime2 = baseTime;
} */
baseTime = SDL_GetTicks();
baseTime2 = baseTime;
}
}
// reset the game time modifiers