[Scummvm-cvs-logs] SF.net SVN: scummvm: [24870] scummvm/trunk/graphics/dxa_player.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Dec 18 08:24:38 CET 2006
Revision: 24870
http://scummvm.svn.sourceforge.net/scummvm/?rev=24870&view=rev
Author: eriktorbjorn
Date: 2006-12-17 23:24:36 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
Check _scaleMode when decoding a NULL frame. Otherwise we will draw the
unscaled frame when playing a scaled movie. (The Broken Sword 1 intro is a
good example of this since it is scaled and uses NULL frames early on.)
Modified Paths:
--------------
scummvm/trunk/graphics/dxa_player.cpp
Modified: scummvm/trunk/graphics/dxa_player.cpp
===================================================================
--- scummvm/trunk/graphics/dxa_player.cpp 2006-12-17 23:06:21 UTC (rev 24869)
+++ scummvm/trunk/graphics/dxa_player.cpp 2006-12-18 07:24:36 UTC (rev 24870)
@@ -535,8 +535,12 @@
}
}
- if (tag == MKID_BE('NULL'))
- _drawBuffer = _frameBuffer1;
+ if (tag == MKID_BE('NULL')) {
+ if (_scaleMode == S_NONE)
+ _drawBuffer = _frameBuffer1;
+ else
+ _drawBuffer = _scaledBuffer;
+ }
}
} // End of namespace Graphics
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