diff options
| author | Matthew Hoops | 2012-01-16 20:19:17 -0500 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2012-02-23 22:48:19 +0100 |
| commit | 7a3e0ea45300ba950d71ba0eae9381a0b0869f01 (patch) | |
| tree | 9815742b77ecc8bb8769e12c56c9e025e45f8020 | |
| parent | a352c3cc000fb13f0dae32e84a859a8fb5cb5966 (diff) | |
| download | scummvm-rg350-7a3e0ea45300ba950d71ba0eae9381a0b0869f01.tar.gz scummvm-rg350-7a3e0ea45300ba950d71ba0eae9381a0b0869f01.tar.bz2 scummvm-rg350-7a3e0ea45300ba950d71ba0eae9381a0b0869f01.zip | |
SWORD1: Add some TODO's for PSX stream subtitles
And some other minor cleanup
| -rw-r--r-- | engines/sword1/animation.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index e25b986d40..a3d732e13b 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -88,7 +88,7 @@ static const char *const sequenceListPSX[20] = { "candle1", "geodrop1", "vulture1", - "", // not present + "", // demo video not present "" // credits are not a video }; @@ -102,8 +102,8 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, ResMan *resMan, Audio:: _decoderType = decoderType; _decoder = decoder; - _white = (decoderType == kVideoDecoderPSX) ? _system->getScreenFormat().RGBToColor(0xff, 0xff, 0xff) : 255; - _black = (decoderType == kVideoDecoderPSX) ? _system->getScreenFormat().RGBToColor(0x00, 0x00, 0x00) : 0; + _white = 255; + _black = 0; } MoviePlayer::~MoviePlayer() { @@ -224,8 +224,9 @@ void MoviePlayer::play() { } void MoviePlayer::performPostProcessing(byte *screen) { - // TODO - if (_decoderType == kVideoDecoderPSX) + // TODO: We don't support the PSX stream videos yet + // nor using the PSX fonts to display subtitles. + if (_vm->isPsx()) return; if (!_movieTexts.empty()) { @@ -361,11 +362,11 @@ bool MoviePlayer::playVideo() { } uint32 MoviePlayer::getBlackColor() { - return _black; + return (_decoderType == kVideoDecoderPSX) ? g_system->getScreenFormat().RGBToColor(0x00, 0x00, 0x00) : _black; } uint32 MoviePlayer::getWhiteColor() { - return _white; + return (_decoderType == kVideoDecoderPSX) ? g_system->getScreenFormat().RGBToColor(0xFF, 0xFF, 0xFF) : _white; } void MoviePlayer::drawFramePSX(const Graphics::Surface *frame) { |