libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug #2874489 - "SCI: Larry 3 crashes at startup"

Browse Source 
svn-id: r45169
This commit is contained in:
Filippos Karapetis 2009-10-16 17:29:36 +00:00
parent ef05105961
commit c957d75fd0
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engines/sci/engine/kfile.cpp
View File

@ -125,6 +125,20 @@ void file_open(EngineState *s, const char *filename, int mode) {
// If no matching savestate exists: fall back to reading from a regular file
if (!inFile)
inFile = SearchMan.createReadStreamForMember(englishName);
// Special case for LSL3: It tries to create a new dummy file, LARRY3.DRV
// Apparently, if the file doesn't exist here, it should be created. The game
// scripts then go ahead and fill its contents with data. It seems to be a similar
// case as the dummy MEMORY.DRV file in LSL5, but LSL5 creates the file if it can't
// find it with a separate call to file_open()
if (!inFile && englishName == "LARRY3.DRV") {
outFile = saveFileMan->openForSaving(wrappedName);
outFile->finalize();
delete outFile;
outFile = 0;
inFile = SearchMan.createReadStreamForMember(wrappedName);
}
if (!inFile)
warning("file_open(_K_FILE_MODE_OPEN_OR_FAIL) failed to open file '%s'", englishName.c_str());
} else if (mode == _K_FILE_MODE_CREATE) {
@ -233,7 +247,8 @@ void file_close(EngineState *s, int handle) {
reg_t kFClose(EngineState *s, int argc, reg_t *argv) {
debug(3, "kFClose(%d)", argv[0].toUint16());
file_close(s, argv[0].toUint16());
if (argv[0] != SIGNAL_REG)
file_close(s, argv[0].toUint16());
return s->r_acc;
}