diff options
| author | Colin Snover | 2016-08-13 12:57:44 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-19 15:23:10 -0500 |
| commit | 6708b58faf145158b47e2184f8d776fa6426305e (patch) | |
| tree | 4e588e0c59e4dedfd5a963a0cc8b71ed4fd2dbc7 /engines/sci | |
| parent | 4e1a9be816c14593b37a672b0789528b1719a199 (diff) | |
| download | scummvm-rg350-6708b58faf145158b47e2184f8d776fa6426305e.tar.gz scummvm-rg350-6708b58faf145158b47e2184f8d776fa6426305e.tar.bz2 scummvm-rg350-6708b58faf145158b47e2184f8d776fa6426305e.zip | |
SCI: Remove references to SCI32 features from SCI16 video player
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/kvideo.cpp | 11 | ||||
| -rw-r--r-- | engines/sci/engine/state.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index 9e5da20bbc..f61673eacf 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -72,11 +72,10 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) { uint16 y = (screenHeight - height) / 2; bool skipVideo = false; - EngineState *s = g_sci->getEngineState(); if (videoDecoder->hasDirtyPalette()) { - const byte *palette = videoDecoder->getPalette() + s->_vmdPalStart * 3; - g_system->getPaletteManager()->setPalette(palette, s->_vmdPalStart, s->_vmdPalEnd - s->_vmdPalStart); + const byte *palette = videoDecoder->getPalette(); + g_system->getPaletteManager()->setPalette(palette, 0, 255); } while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) { @@ -85,7 +84,7 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) { if (frame) { if (scaleBuffer) { - // TODO: Probably should do aspect ratio correction in e.g. GK1 Windows + // TODO: Probably should do aspect ratio correction in KQ6 g_sci->_gfxScreen->scale2x((const byte *)frame->getPixels(), scaleBuffer, videoDecoder->getWidth(), videoDecoder->getHeight(), bytesPerPixel); g_system->copyRectToScreen(scaleBuffer, pitch, x, y, width, height); } else { @@ -93,8 +92,8 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) { } if (videoDecoder->hasDirtyPalette()) { - const byte *palette = videoDecoder->getPalette() + s->_vmdPalStart * 3; - g_system->getPaletteManager()->setPalette(palette, s->_vmdPalStart, s->_vmdPalEnd - s->_vmdPalStart); + const byte *palette = videoDecoder->getPalette(); + g_system->getPaletteManager()->setPalette(palette, 0, 255); } g_system->updateScreen(); diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index 2c85907628..a338beffc9 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -121,9 +121,6 @@ void EngineState::reset(bool isRestoring) { _videoState.reset(); _syncedAudioOptions = false; - - _vmdPalStart = 0; - _vmdPalEnd = 256; } void EngineState::speedThrottler(uint32 neededSleep) { diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index dd8d76f002..baa912b60e 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -203,7 +203,6 @@ public: // TODO: Excise video code from the state manager VideoState _videoState; - uint16 _vmdPalStart, _vmdPalEnd; bool _syncedAudioOptions; /** |