[Scummvm-cvs-logs] SF.net SVN: scummvm:[43150] scummvm/trunk/engines/tinsel/tinlib.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Aug 9 03:05:47 CEST 2009


Revision: 43150
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43150&view=rev
Author:   dreammaster
Date:     2009-08-09 01:05:47 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
Changed subtitles display speed to also include the time taken to say voice samples (if voices are turned on). This means subtitles will display for the same time irrespective of whether voices are on or not

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/tinlib.cpp

Modified: scummvm/trunk/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.cpp	2009-08-08 21:59:18 UTC (rev 43149)
+++ scummvm/trunk/engines/tinsel/tinlib.cpp	2009-08-09 01:05:47 UTC (rev 43150)
@@ -2196,6 +2196,10 @@
 								_ctx->bSample = false;
 							}
 						}
+
+						// Decrement the subtitles timeout counter
+						if (_ctx->ticks > 0) --_ctx->ticks;
+
 					} else {
 						// No sample - just depends on time
 						if (_ctx->ticks-- <= 0)
@@ -2327,6 +2331,10 @@
 						_ctx->bSample = false;
 					}
 				}
+
+				// Decrement the subtitles timeout counter
+				if (_ctx->ticks > 0) --_ctx->ticks;
+
 			} else {
 				// No sample - just depends on time
 				if (_ctx->ticks-- <= 0)
@@ -3437,6 +3445,10 @@
 						_ctx->bSample = false;
 					}
 				}
+
+				// Decrement the subtitles timeout counter
+				if (_ctx->ticks > 0) --_ctx->ticks;
+
 			} else {
 				// No sample - just depends on time
 				if (_ctx->ticks-- <= 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list