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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jan 6 18:49:41 CET 2009


Revision: 35760
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35760&view=rev
Author:   thebluegr
Date:     2009-01-06 17:49:41 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
Updated SWORD1 with the latest changes to video players

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

Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp	2009-01-06 17:46:38 UTC (rev 35759)
+++ scummvm/trunk/engines/sword1/animation.cpp	2009-01-06 17:49:41 UTC (rev 35760)
@@ -430,7 +430,7 @@
 }
 
 bool MoviePlayerDXA::decodeFrame(void) {
-	if (_currentFrame < _framesCount) {
+	if ((uint32)_currentFrame < (uint32)getFrameCount()) {
 		decodeNextFrame();
 		return true;
 	}
@@ -441,7 +441,8 @@
 }
 
 void MoviePlayerDXA::updateScreen(void) {
-	_system->copyRectToScreen(_drawBuffer, _frameWidth, _frameX, _frameY, _frameWidth, _frameHeight);
+	Graphics::Surface *frameBuffer = _system->lockScreen();
+	copyFrameToBuffer((byte *)frameBuffer->pixels, _frameX, _frameY, _frameWidth);
 
 	// TODO: Handle the advanced cutscene packs. Do they really exist?
 
@@ -452,7 +453,6 @@
 	// frame to it, and draw on that.
 
 	if (_textMan->giveSpriteData(2)) {
-		Graphics::Surface *frameBuffer = _system->lockScreen();
 		byte *src = (byte *)_textMan->giveSpriteData(2) + sizeof(FrameHeader);
 		byte *dst = (byte *)frameBuffer->getBasePtr(_textX, _textY);
 
@@ -471,9 +471,10 @@
 			dst += frameBuffer->pitch;
 		}
 
-		_system->unlockScreen();
 	}
 
+	_system->unlockScreen();
+
 	_system->updateScreen();
 }
 


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




More information about the Scummvm-git-logs mailing list