teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-27 14:22:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't scale cinematic time by timescale twice

Browse source 
Reported by Ensiform.
This commit is contained in:
Zack Middleton 2014-08-28 19:10:04 -05:00
parent ab41267e9f
commit eeef7cbae7
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/client/cl_cin.c
View file

@ -1158,7 +1158,7 @@ redump:
if (cinTable[currentHandle].numQuads == -1) { if (cinTable[currentHandle].numQuads == -1) {
readQuadInfo( framedata ); readQuadInfo( framedata );
setupQuad( 0, 0 ); setupQuad( 0, 0 );
cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds()*com_timescale->value; cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds();
} }
if (cinTable[currentHandle].numQuads != 1) cinTable[currentHandle].numQuads = 0; if (cinTable[currentHandle].numQuads != 1) cinTable[currentHandle].numQuads = 0;
break; break;
@ -1225,7 +1225,7 @@ redump:
static void RoQ_init( void ) static void RoQ_init( void )
{ {
cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds()*com_timescale->value; cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds();
cinTable[currentHandle].RoQPlayed = 24; cinTable[currentHandle].RoQPlayed = 24;
@ -1356,11 +1356,11 @@ e_status CIN_RunCinematic (int handle)
return cinTable[currentHandle].status; return cinTable[currentHandle].status;
} }
thisTime = CL_ScaledMilliseconds()*com_timescale->value; thisTime = CL_ScaledMilliseconds();
if (cinTable[currentHandle].shader && (abs(thisTime - cinTable[currentHandle].lastTime))>100) { if (cinTable[currentHandle].shader && (abs(thisTime - cinTable[currentHandle].lastTime))>100) {
cinTable[currentHandle].startTime += thisTime - cinTable[currentHandle].lastTime; cinTable[currentHandle].startTime += thisTime - cinTable[currentHandle].lastTime;
} }
cinTable[currentHandle].tfps = ((((CL_ScaledMilliseconds()*com_timescale->value) - cinTable[currentHandle].startTime)*3)/100); cinTable[currentHandle].tfps = (((CL_ScaledMilliseconds() - cinTable[currentHandle].startTime)*3)/100);
start = cinTable[currentHandle].startTime; start = cinTable[currentHandle].startTime;
while( (cinTable[currentHandle].tfps != cinTable[currentHandle].numQuads) while( (cinTable[currentHandle].tfps != cinTable[currentHandle].numQuads)
@ -1368,8 +1368,7 @@ e_status CIN_RunCinematic (int handle)
{ {
RoQInterrupt(); RoQInterrupt();
if (start != cinTable[currentHandle].startTime) { if (start != cinTable[currentHandle].startTime) {
cinTable[currentHandle].tfps = ((((CL_ScaledMilliseconds()*com_timescale->value) cinTable[currentHandle].tfps = (((CL_ScaledMilliseconds() - cinTable[currentHandle].startTime)*3)/100);
- cinTable[currentHandle].startTime)*3)/100);
start = cinTable[currentHandle].startTime; start = cinTable[currentHandle].startTime;
} }
} }