diff options
| author | Arnaud Boutonné | 2009-10-14 14:06:53 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2009-10-14 14:06:53 +0000 |
| commit | c93c9cb68dded6d4a47de73c2de74d433b027439 (patch) | |
| tree | e1610388db7e193889a216fbbbd780ea0d0c557f | |
| parent | f286a6d5b9d37cc57367a01d13c397769d88957e (diff) | |
| download | scummvm-rg350-c93c9cb68dded6d4a47de73c2de74d433b027439.tar.gz scummvm-rg350-c93c9cb68dded6d4a47de73c2de74d433b027439.tar.bz2 scummvm-rg350-c93c9cb68dded6d4a47de73c2de74d433b027439.zip | |
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)
svn-id: r45080
| -rw-r--r-- | graphics/video/coktelvideo/coktelvideo.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/graphics/video/coktelvideo/coktelvideo.cpp b/graphics/video/coktelvideo/coktelvideo.cpp index b056388f7d..e92e470cbe 100644 --- a/graphics/video/coktelvideo/coktelvideo.cpp +++ b/graphics/video/coktelvideo/coktelvideo.cpp @@ -431,6 +431,11 @@ void Imd::seekFrame(int32 frame, int16 whence, bool restart) { 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("Imd::seekFrame(): Frame %d is not directly accessible", frame); |