diff options
| author | Max Horn | 2004-06-27 22:14:35 +0000 |
|---|---|---|
| committer | Max Horn | 2004-06-27 22:14:35 +0000 |
| commit | b8ad54b3af1de97bf986e7e4d4da97f02ece3273 (patch) | |
| tree | 59bb3fbadaa8857a75010692593bef3a866d49cb /scumm | |
| parent | a461c7550e2260601a63cd113a31254f2fd3ef50 (diff) | |
| download | scummvm-rg350-b8ad54b3af1de97bf986e7e4d4da97f02ece3273.tar.gz scummvm-rg350-b8ad54b3af1de97bf986e7e4d4da97f02ece3273.tar.bz2 scummvm-rg350-b8ad54b3af1de97bf986e7e4d4da97f02ece3273.zip | |
Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls
svn-id: r14090
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/debugger.cpp | 2 | ||||
| -rw-r--r-- | scumm/resource.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v6he.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 6a68fe0a9e..c4a0da71f5 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -315,7 +315,7 @@ bool ScummDebugger::Cmd_ImportRes(int argc, const char** argv) { // FIXME add bounds check if (!strncmp(argv[1], "scr", 3)) { - file.open(argv[2], ""); + file.open(argv[2], File::kFileReadMode, ""); if (file.isOpen() == false) { DebugPrintf("Could not open file %s\n", argv[2]); return true; diff --git a/scumm/resource.cpp b/scumm/resource.cpp index ba13e8dbc8..d12fd6e958 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -2278,7 +2278,7 @@ void ScummEngine::dumpResource(const char *tag, int idx, const byte *ptr, int le sprintf(buf, "dumps/%s%d.dmp", tag, idx); #endif - out.open(buf, "", File::kFileWriteMode); + out.open(buf, File::kFileWriteMode, ""); if (out.isOpen() == false) return; out.write(ptr, size); diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 6cd1b830aa..cda559a915 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -1012,9 +1012,9 @@ void ScummEngine_v6he::o6_openFile() { if (slot != -1) { if (mode == 1) - _hFileTable[slot].open((char*)filename + r, getGameDataPath(), File::kFileReadMode); + _hFileTable[slot].open((char*)filename + r, File::kFileReadMode); else if (mode == 2) - _hFileTable[slot].open((char*)filename + r, getGameDataPath(), File::kFileWriteMode); + _hFileTable[slot].open((char*)filename + r, File::kFileWriteMode); else error("o6_openFile(): wrong open file mode"); diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 6f683e06b0..192d10e5d5 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1233,7 +1233,7 @@ void ScummEngine::initScummVars() { File f; while (i < 85) { sprintf(buf, "%d.LFL", i); - f.open(buf, _gameDataPath); + f.open(buf); if (f.isOpen() == false) error("Native MIDI support requires Roland patch from LucasArts"); f.close(); @@ -1241,7 +1241,7 @@ void ScummEngine::initScummVars() { } } else if (_gameId == GID_MONKEY_EGA) { File f; - f.open("DISK09.LEC", _gameDataPath); + f.open("DISK09.LEC"); if (f.isOpen() == false) error("Native MIDI support requires Roland patch from LucasArts"); } |