[Scummvm-cvs-logs] SF.net SVN: scummvm: [23482] scummvm/trunk/engines/sword2/animation.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Thu Jul 20 22:44:57 CEST 2006


Revision: 23482
          http://svn.sourceforge.net/scummvm/?rev=23482&view=rev
Author:   eriktorbjorn
Date:     2006-07-10 11:57:40 -0700 (Mon, 10 Jul 2006)

Log Message:
-----------
Moved the initial screen clearing from play() to load(), so that it will be
done before the MPEG player calls showOverlay().

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/animation.cpp

Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp	2006-07-10 15:45:34 UTC (rev 23481)
+++ scummvm/trunk/engines/sword2/animation.cpp	2006-07-10 18:57:40 UTC (rev 23482)
@@ -257,6 +257,19 @@
 			_numFrames = _movies[i].frames;
 			if (_numFrames > 60)
 				_leadOutFrame = _numFrames - 60;
+
+			// Not all cutscenes cover the entire screen, so clear
+			// it. We will always clear the game screen, no matter
+			// how the cutscene is to be displayed. (We have to do
+			// this before showing the overlay.)
+
+			_vm->_mouse->closeMenuImmediately();
+
+			if (!_seamless) {
+				_vm->_screen->clearScene();
+			}
+
+			_vm->_screen->updateDisplay();
 			return true;
 		}
 	}
@@ -290,18 +303,6 @@
 
 	savePalette();
 
-	// Not all cutscenes cover the entire screen, so clear it. We will
-	// always clear the game screen, no matter how the cutscene is to be
-	// displayed.
-
-	_vm->_mouse->closeMenuImmediately();
-
-	if (!_seamless) {
-		_vm->_screen->clearScene();
-	}
-
-	_vm->_screen->updateDisplay();
-
 #ifndef SCUMM_BIG_ENDIAN
 	flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 #endif






More information about the Scummvm-git-logs mailing list