[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.284,1.285 scumm.h,1.518,1.519 debugger.cpp,1.132,1.133

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16055/scumm

Modified Files:
	resource.cpp scumm.h debugger.cpp 
Log Message:
Don't use directory param of File::open unless you have to

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- resource.cpp	9 Nov 2004 10:26:33 -0000	1.284
+++ resource.cpp	27 Nov 2004 02:26:21 -0000	1.285
@@ -62,8 +62,8 @@
 	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 @@
 	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);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -d -r1.518 -r1.519
--- scumm.h	24 Nov 2004 00:14:14 -0000	1.518
+++ scumm.h	27 Nov 2004 02:26:21 -0000	1.519
@@ -72,7 +72,7 @@
 	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();

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- debugger.cpp	9 Nov 2004 10:26:32 -0000	1.132
+++ debugger.cpp	27 Nov 2004 02:26:21 -0000	1.133
@@ -311,7 +311,7 @@
 	// 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;