[Scummvm-cvs-logs] scummvm master -> 831d358d425b8d0e2725df87054fd321e6e8dd3b

[sylvaintv]

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:
831d358d42 TOON: Fix rare palette glitch during one frame after cutscene


Commit: 831d358d425b8d0e2725df87054fd321e6e8dd3b
    https://github.com/scummvm/scummvm/commit/831d358d425b8d0e2725df87054fd321e6e8dd3b
Author: sylvaintv (sylvaintv at gmail.com)
Date: 2011-07-08T18:26:43-07:00

Commit Message:
TOON: Fix rare palette glitch during one frame after cutscene

Changed paths:
    engines/toon/movie.cpp
    engines/toon/toon.cpp



diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp
index 2318eaa..7637f4e 100644
--- a/engines/toon/movie.cpp
+++ b/engines/toon/movie.cpp
@@ -94,7 +94,7 @@ void Movie::play(Common::String video, int32 flags) {
 		_vm->getAudioManager()->setMusicVolume(0);
 	_decoder->loadFile(video.c_str());
 	playVideo(isFirstIntroVideo);
-	_vm->flushPalette(false);
+	_vm->flushPalette(true);
 	if (flags & 1)
 		_vm->getAudioManager()->setMusicVolume(_vm->getAudioManager()->isMusicMuted() ? 0 : 255);
 	_decoder->close();
@@ -103,7 +103,6 @@ void Movie::play(Common::String video, int32 flags) {
 
 bool Movie::playVideo(bool isFirstIntroVideo) {
 	debugC(1, kDebugMovie, "playVideo(isFirstIntroVideo: %d)", isFirstIntroVideo);
-
 	while (!_vm->shouldQuit() && !_decoder->endOfVideo()) {
 		if (_decoder->needsUpdate()) {
 			const Graphics::Surface *frame = _decoder->decodeNextFrame();
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index c261ca1..401ab3d 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -690,6 +690,11 @@ bool ToonEngine::showMainmenu(bool &loadedGame) {
 				}
 			}
 
+			if (_needPaletteFlush) {
+				flushPalette(false);
+				_needPaletteFlush = false;
+			}
+
 			parseInput();
 			copyToVirtualScreen(true);
 			_system->delayMillis(17);