[iortcw] 195/497: All: Don't scale cinematic time by timescale twice

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit b2d5e3def7c7a5ffe54b2d13175b96ae38fd1d65
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Fri Aug 29 16:58:40 2014 +0000

    All: Don't scale cinematic time by timescale twice
---
 MP/code/client/cl_cin.c | 11 +++++------
 SP/code/client/cl_cin.c |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/MP/code/client/cl_cin.c b/MP/code/client/cl_cin.c
index 1d45c22..d275b10 100644
--- a/MP/code/client/cl_cin.c
+++ b/MP/code/client/cl_cin.c
@@ -1204,7 +1204,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;
@@ -1274,7 +1274,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;
 
@@ -1409,11 +1409,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 )
@@ -1421,8 +1421,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;
 		}
 	}
diff --git a/SP/code/client/cl_cin.c b/SP/code/client/cl_cin.c
index 02ac73b..f4a985e 100644
--- a/SP/code/client/cl_cin.c
+++ b/SP/code/client/cl_cin.c
@@ -1209,7 +1209,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;
@@ -1285,7 +1285,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;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git