thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Implement kPlayVMD subop 23 (set palette range)

Browse source 
Fixes the wrong palette during video sequences in GK2 and the demo of RAMA
This commit is contained in:
Filippos Karapetis 2012-06-23 21:00:25 +03:00
parent a6b65b84b0
commit f06eb05e8c
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engines/sci/engine/kvideo.cpp
View file

@ -32,6 +32,7 @@
#include "common/str.h"
#include "common/system.h"
#include "common/textconsole.h"
#include "graphics/palette.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
#include "video/video_decoder.h"
@ -86,9 +87,12 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) {
}
bool skipVideo = false;
EngineState *s = g_sci->getEngineState();
if (videoDecoder->hasDirtyPalette())
videoDecoder->setSystemPalette();
if (videoDecoder->hasDirtyPalette()) {
byte *palette = (byte *)videoDecoder->getPalette() + s->_vmdPalStart * 3;
g_system->getPaletteManager()->setPalette(palette, s->_vmdPalStart, s->_vmdPalEnd - s->_vmdPalStart);
}
while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) {
if (videoDecoder->needsUpdate()) {
@ -103,8 +107,10 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) {
g_system->copyRectToScreen(frame->pixels, frame->pitch, x, y, width, height);
}
if (videoDecoder->hasDirtyPalette())
videoDecoder->setSystemPalette();
if (videoDecoder->hasDirtyPalette()) {
byte *palette = (byte *)videoDecoder->getPalette() + s->_vmdPalStart * 3;
g_system->getPaletteManager()->setPalette(palette, s->_vmdPalStart, s->_vmdPalEnd - s->_vmdPalStart);
}
g_system->updateScreen();
}
@ -361,6 +367,10 @@ reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv) {
if (reshowCursor)
g_sci->_gfxCursor->kernelShow();
break;
case 23: // set video palette range
s->_vmdPalStart = argv[1].toUint16();
s->_vmdPalEnd = argv[2].toUint16();
break;
case 14:
// Takes an additional integer parameter (e.g. 3)
case 16:

2
engines/sci/engine/state.cpp
View file

@ -122,6 +122,8 @@ void EngineState::reset(bool isRestoring) {
_videoState.reset();
_syncedAudioOptions = false;
_vmdPalStart = 0;
_vmdPalEnd = 256;
}
void EngineState::speedThrottler(uint32 neededSleep) {

1
engines/sci/engine/state.h
View file

@ -196,6 +196,7 @@ public:
byte _memorySegment[kMemorySegmentMax];
VideoState _videoState;
uint16 _vmdPalStart, _vmdPalEnd;
bool _syncedAudioOptions;
/**