From eeef7cbae7d3e265a2b0b08c414cc425b3b30dc5 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 28 Aug 2014 19:10:04 -0500 Subject: [PATCH] Don't scale cinematic time by timescale twice Reported by Ensiform. --- code/client/cl_cin.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/client/cl_cin.c b/code/client/cl_cin.c index 599443c9..d79f3db6 100644 --- a/code/client/cl_cin.c +++ b/code/client/cl_cin.c @@ -1158,7 +1158,7 @@ redump: if (cinTable[currentHandle].numQuads == -1) { readQuadInfo( framedata ); 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; break; @@ -1225,7 +1225,7 @@ redump: 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; @@ -1356,11 +1356,11 @@ e_status CIN_RunCinematic (int handle) return cinTable[currentHandle].status; } - thisTime = CL_ScaledMilliseconds()*com_timescale->value; + thisTime = CL_ScaledMilliseconds(); if (cinTable[currentHandle].shader && (abs(thisTime - cinTable[currentHandle].lastTime))>100) { 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; while( (cinTable[currentHandle].tfps != cinTable[currentHandle].numQuads) @@ -1368,8 +1368,7 @@ e_status CIN_RunCinematic (int handle) { RoQInterrupt(); if (start != cinTable[currentHandle].startTime) { - 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; } }