[Scummvm-cvs-logs] SF.net SVN: scummvm:[42997] scummvm/branches/branch-1-0-0

[drmccoy at users.sourceforge.net]

Revision: 42997
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42997&view=rev
Author:   drmccoy
Date:     2009-08-02 10:41:39 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
Backport: When ESCing videos, seek to the last frame that was meant to be played. Fixes graphical glitches (bug #2830985) and crashes (bug #2830988)

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp
    scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp

Modified: scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp	2009-08-02 10:40:48 UTC (rev 42996)
+++ scummvm/branches/branch-1-0-0/engines/gob/videoplayer.cpp	2009-08-02 10:41:39 UTC (rev 42997)
@@ -736,6 +736,8 @@
 		_vm->_inter->storeKey(_vm->_util->checkKey());
 		if (VAR(0) == (unsigned) breakKey) {
 			_primaryVideo->getVideo()->disableSound();
+			// Seek to the last frame. Some scripts depend on that.
+			_primaryVideo->getVideo()->seekFrame(endFrame, SEEK_SET, true);
 			return true;
 		}
 	}

Modified: scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp	2009-08-02 10:40:48 UTC (rev 42996)
+++ scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp	2009-08-02 10:41:39 UTC (rev 42997)
@@ -314,6 +314,7 @@
 	} else if (restart && (_soundStage == 0)) {
 		for (int i = ((frame > _curFrame) ? _curFrame : 0); i <= frame; i++)
 			processFrame(i);
+		return;
 	} else
 		error("Frame %d is not directly accessible", frame);
 


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