[Scummvm-cvs-logs] scummvm master -> c23f8f856c7e5a2fa11722870607d876c5894e18

scott-t s at sthomas.id.au
Tue Nov 29 13:03:11 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c23f8f856c GROOVIE: Prefer 'mask' animations to run at regular speed.


Commit: c23f8f856c7e5a2fa11722870607d876c5894e18
    https://github.com/scummvm/scummvm/commit/c23f8f856c7e5a2fa11722870607d876c5894e18
Author: Scott Thomas (scott_t at users.sourceforge.net)
Date: 2011-11-29T04:01:26-08:00

Commit Message:
GROOVIE: Prefer 'mask' animations to run at regular speed.

Not all 'mask' animations have sound, so need to mark preference for
regular speed for both 'mask' and 'teeth' animations.

Changed paths:
    engines/groovie/script.cpp



diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 9003a58..a8b4417 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -590,9 +590,9 @@ bool Script::playvideofromref(uint32 fileref) {
 
 		if (_videoFile) {
 			_videoRef = fileref;
-			// If teeth cursor, and in main script, mark video prefer low-speed
-			// filename check as sometimes teeth used for puzzle movements (bishops)
-			if (_version == kGroovieT7G && _lastCursor == 7 && _scriptFile == "script.grv")
+			// If teeth or mask cursor, and in main script, mark video prefer low-speed.
+			// Filename check as sometimes teeth used for puzzle movements (bishops)
+			if (_version == kGroovieT7G && (_lastCursor == 7 || _lastCursor == 4) && _scriptFile == "script.grv")
 				_bitflags |= (1 << 15);
 			_vm->_videoPlayer->load(_videoFile, _bitflags);
 		} else {






More information about the Scummvm-git-logs mailing list