libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 14:09:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add work around for bug in a German Windows 2CD version of FF. Trigger error if video file not found, since they are required by several part of FF

Browse Source 
svn-id: r22869
This commit is contained in:
Travis Howell 2006-06-03 13:24:59 +00:00
parent 75af002bd3
commit 7d5d40774b
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
engines/simon/animation.cpp
View File

@ -73,7 +73,7 @@ MoviePlayer::~MoviePlayer() {
} }
bool MoviePlayer::load(const char *filename) { bool MoviePlayer::load(const char *filename) {
char filename2[100]; char videoName[20];
uint32 tag; uint32 tag;
int32 frameRate; int32 frameRate;
uint i; uint i;
@ -83,16 +83,28 @@ bool MoviePlayer::load(const char *filename) {
memcpy(baseName, filename, baseLen); memcpy(baseName, filename, baseLen);
// Change file extension to dxa // Change file extension to dxa
strcpy(filename2, filename); sprintf(videoName, "%s.dxa", baseName);
filename2[baseLen + 1] = 'd';
filename2[baseLen + 2] = 'x';
filename2[baseLen + 3] = 'a';
if (_fd.open(filename2) == false) { if (_fd.open(videoName) == false) {
warning("Failed to load video file %s", filename2); // Check short filename to work around
return false; // bug in a German Windows 2CD version.
if (baseLen >= 8) {
char shortName[20];
memset(shortName, 0, sizeof(shortName));
memcpy(shortName, filename, 6);
sprintf(shortName, "%s~1.dxa", shortName);
if (_fd.open(shortName) == false) {
error("Failed to load video file %s or %s", videoName, shortName);
} else {
debug(0, "Playing video %s", shortName);
}
} else {
error("Failed to load video file %s", videoName);
}
} else {
debug(0, "Playing video %s", videoName);
} }
debug(0, "Playing video %s", filename2);
CursorMan.showMouse(false); CursorMan.showMouse(false);
@ -100,7 +112,7 @@ bool MoviePlayer::load(const char *filename) {
_vm->_language != Common::EN_ANY) { _vm->_language != Common::EN_ANY) {
_sequenceNum = 0; _sequenceNum = 0;
for (i = 0; i < 90; i++) { for (i = 0; i < 90; i++) {
if (!scumm_stricmp(filename2, _sequenceList[i])) if (!scumm_stricmp(videoName, _sequenceList[i]))
_sequenceNum = i; _sequenceNum = i;
} }
} }
@ -155,7 +167,7 @@ void MoviePlayer::playOmniTV() {
} }
void MoviePlayer::play() { void MoviePlayer::play() {
if (_vm->getBitFlag(40)) { if (_vm->getPlatform() == Common::kPlatformWindows && _vm->getBitFlag(40)) {
playOmniTV(); playOmniTV();
return; return;
} }