diff options
| author | Torbjörn Andersson | 2006-06-03 09:43:10 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-06-03 09:43:10 +0000 |
| commit | 3114f19d9461037ecea9ef3fd42f65dd4f8357df (patch) | |
| tree | aac454f0c6e6e043e648556e31d49eb7558156d8 /graphics | |
| parent | 4b706aca434ac7c2753c3d73bcf4022be0b2cde6 (diff) | |
| download | scummvm-rg350-3114f19d9461037ecea9ef3fd42f65dd4f8357df.tar.gz scummvm-rg350-3114f19d9461037ecea9ef3fd42f65dd4f8357df.tar.bz2 scummvm-rg350-3114f19d9461037ecea9ef3fd42f65dd4f8357df.zip | |
MPEG player fixes:
* Initialise _frameWidth and _frameHeight to prevent them from being undefined.
* Fix BS2 subtitle positioning. (Fixes bug #1499916)
* In BS2, copy the frame to the backend in 8-bit mode.
* Fix compilation in 8-bit mode.
BS2 subtitles aren't quite right in 8-bit mode, but I expect we want to
re-design things a bit if we ever add DXA cutscenes. We can fix minor details
then.
svn-id: r22859
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/animation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp index 801d0c8134..a49d33e4a0 100644 --- a/graphics/animation.cpp +++ b/graphics/animation.cpp @@ -32,7 +32,7 @@ namespace Graphics { BaseAnimationState::BaseAnimationState(Audio::Mixer *snd, OSystem *sys, int width, int height) - : _movieWidth(width), _movieHeight(height), _snd(snd), _sys(sys) { + : _movieWidth(width), _movieHeight(height), _frameWidth(width), _frameHeight(height), _snd(snd), _sys(sys) { #ifndef BACKEND_8BIT const int screenW = _sys->getOverlayWidth(); const int screenH = _sys->getOverlayHeight(); @@ -661,6 +661,8 @@ void BaseAnimationState::plotYUV3x(int width, int height, byte *const *dat) { } } +#endif + void BaseAnimationState::updateScreen() { #ifndef BACKEND_8BIT int width = _movieScale * _frameWidth; @@ -678,6 +680,4 @@ void BaseAnimationState::updateScreen() { _sys->updateScreen(); } -#endif - } // End of namespace Graphics |