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

SWORD1: Add support for the PSX demo videos

Browse source
This commit is contained in:
Matthew Hoops 2012-01-16 20:27:36 -05:00 • committed by Willem Jan Palenstijn
parent 8fea496890
commit a352c3cc00
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engines/sword1/animation.cpp
View file

@ -88,8 +88,8 @@ static const char *const sequenceListPSX[20] = {
"candle1", "candle1",
"geodrop1", "geodrop1",
"vulture1", "vulture1",
"", "", // not present
"" // no credits? "" // credits are not a video
}; };
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -173,7 +173,7 @@ bool MoviePlayer::load(uint32 id) {
filename = Common::String::format("%s.smk", sequenceList[id]); filename = Common::String::format("%s.smk", sequenceList[id]);
break; break;
case kVideoDecoderPSX: case kVideoDecoderPSX:
filename = Common::String::format("%s.str", sequenceListPSX[id]); filename = Common::String::format("%s.str", (_vm->_systemVars.isDemo) ? sequenceList[id] : sequenceListPSX[id]);
// Need to switch to true color // Need to switch to true color
initGraphics(g_system->getWidth(), g_system->getHeight(), true, 0); initGraphics(g_system->getWidth(), g_system->getHeight(), true, 0);
@ -406,7 +406,8 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
// For the PSX version, we'll try the PlayStation stream files // For the PSX version, we'll try the PlayStation stream files
if (vm->isPsx()) { if (vm->isPsx()) {
filename = Common::String(sequenceListPSX[id]) + ".str"; // The demo uses the normal file names
filename = ((vm->_systemVars.isDemo) ? Common::String(sequenceList[id]) : Common::String(sequenceListPSX[id])) + ".str";
if (Common::File::exists(filename)) { if (Common::File::exists(filename)) {
#ifdef USE_RGB_COLOR #ifdef USE_RGB_COLOR
@ -450,9 +451,11 @@ MoviePlayer *makeMoviePlayer(uint32 id, SwordEngine *vm, Text *textMan, ResMan *
return NULL; return NULL;
} }
Common::String buf = Common::String::format(_("Cutscene '%s' not found"), sequenceList[id]); if (!vm->isPsx() || scumm_stricmp(sequenceList[id], "enddemo") != 0) {
GUI::MessageDialog dialog(buf, _("OK")); Common::String buf = Common::String::format(_("Cutscene '%s' not found"), sequenceList[id]);
dialog.runModal(); GUI::MessageDialog dialog(buf, _("OK"));
dialog.runModal();
}
return NULL; return NULL;
} }