[Scummvm-cvs-logs] SF.net SVN: scummvm:[45081] scummvm/branches/branch-1-0-0/graphics/video/ coktelvideo/coktelvideo.cpp

[strangerke at users.sourceforge.net]

Revision: 45081
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45081&view=rev
Author:   strangerke
Date:     2009-10-14 14:15:40 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
Backport of r45080: gob: fix a regression in Bargon Attack intro caused by a fix of Ween problems. Still requires a more proper fix, but at least it doesn't hang anymore (closing bug #2878717)

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

Modified: scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp	2009-10-14 14:06:53 UTC (rev 45080)
+++ scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp	2009-10-14 14:15:40 UTC (rev 45081)
@@ -318,6 +318,11 @@
 		for (int i = ((frame > _curFrame) ? _curFrame : 0); i <= frame; i++)
 			processFrame(i);
 		return;
+//FIXME: This workaround is needed for Bargon Attack intro, which was broken by a fix concerning Ween in r42995.
+	} else if (_soundStage == 0) {
+		warning("Imd::seekFrame(): Avoiding \"Frame %d is not directly accessible\"", frame);
+		_curFrame = frame;
+//End of fixme
 	} 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.