[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.65,1.66 script_v6he.cpp,2.69,2.70 resource.cpp,1.224,1.225 debugger.cpp,1.123,1.124
Max Horn
fingolfin at users.sourceforge.net
Sun Jun 27 15:15:15 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen resource.cpp,1.44,1.45
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon res.cpp,1.28,1.29 sound.cpp,1.65,1.66 simon.cpp,1.435,1.436 items.cpp,1.112,1.113 sound.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19289/scumm
Modified Files:
scumm.cpp script_v6he.cpp resource.cpp debugger.cpp
Log Message:
Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- scumm.cpp 27 Jun 2004 21:52:24 -0000 1.65
+++ scumm.cpp 27 Jun 2004 22:14:33 -0000 1.66
@@ -1233,7 +1233,7 @@
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 @@
}
} 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");
}
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -d -r2.69 -r2.70
--- script_v6he.cpp 27 Jun 2004 02:17:56 -0000 2.69
+++ script_v6he.cpp 27 Jun 2004 22:14:33 -0000 2.70
@@ -1012,9 +1012,9 @@
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");
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- resource.cpp 27 Jun 2004 21:52:23 -0000 1.224
+++ resource.cpp 27 Jun 2004 22:14:33 -0000 1.225
@@ -2278,7 +2278,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: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- debugger.cpp 16 Mar 2004 23:51:41 -0000 1.123
+++ debugger.cpp 27 Jun 2004 22:14:33 -0000 1.124
@@ -315,7 +315,7 @@
// 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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen resource.cpp,1.44,1.45
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon res.cpp,1.28,1.29 sound.cpp,1.65,1.66 simon.cpp,1.435,1.436 items.cpp,1.112,1.113 sound.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list