diff options
| author | Max Horn | 2004-11-27 02:26:21 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-27 02:26:21 +0000 |
| commit | d172111444300a601cfab9dfc55fdef5d015f51c (patch) | |
| tree | c2b8df8589052ed7887c584576cab3df96670b8a | |
| parent | 096f2b61103db3af432bdc5030b303e25a9f28a8 (diff) | |
| download | scummvm-rg350-d172111444300a601cfab9dfc55fdef5d015f51c.tar.gz scummvm-rg350-d172111444300a601cfab9dfc55fdef5d015f51c.tar.bz2 scummvm-rg350-d172111444300a601cfab9dfc55fdef5d015f51c.zip | |
Don't use directory param of File::open unless you have to
svn-id: r15904
| -rw-r--r-- | scumm/debugger.cpp | 2 | ||||
| -rw-r--r-- | scumm/resource.cpp | 6 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | sword1/resman.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index 1abc6832ea..c2c206c416 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -311,7 +311,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::kFileReadMode, ""); + 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 724073b094..6b8884bb7e 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -62,8 +62,8 @@ void ScummFile::resetSubfile() { seek(0, SEEK_SET); } -bool ScummFile::open(const char *filename, AccessMode mode, const char *directory) { - if (File::open(filename, mode, directory)) { +bool ScummFile::open(const char *filename, AccessMode mode) { + if (File::open(filename, mode)) { resetSubfile(); return true; } else { @@ -2482,7 +2482,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/scumm.h b/scumm/scumm.h index 25aeaac501..03be6cbea4 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -72,7 +72,7 @@ public: void setSubfileRange(uint32 start, uint32 len); void resetSubfile(); - bool open(const char *filename, AccessMode mode = kFileReadMode, const char *directory = NULL); + bool open(const char *filename, AccessMode mode = kFileReadMode); bool openSubFile(const char *filename); bool eof(); diff --git a/sword1/resman.cpp b/sword1/resman.cpp index 63cb31409c..4841a3d239 100644 --- a/sword1/resman.cpp +++ b/sword1/resman.cpp @@ -187,7 +187,7 @@ void ResMan::dumpRes(uint32 id) { char outn[30]; sprintf(outn, "DUMP%08X.BIN", id); File outf; - if (outf.open(outn, File::kFileWriteMode, "")) { + if (outf.open(outn, File::kFileWriteMode)) { resOpen(id); MemHandle *memHandle = resHandle(id); outf.write(memHandle->data, memHandle->size); |