[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.144,2.145 script_v72he.cpp,2.216,2.217
kirben
kirben at users.sourceforge.net
Wed Mar 9 16:51:29 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6833/scumm
Modified Files:
script_v6he.cpp script_v72he.cpp
Log Message:
Add last change to o60_opeFile too.
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.144
retrieving revision 2.145
diff -u -d -r2.144 -r2.145
--- script_v6he.cpp 3 Mar 2005 03:06:30 -0000 2.144
+++ script_v6he.cpp 10 Mar 2005 00:50:53 -0000 2.145
@@ -24,6 +24,7 @@
#include "stdafx.h"
#include "common/config-manager.h"
+#include "common/savefile.h"
#include "scumm/actor.h"
#include "scumm/charset.h"
@@ -1028,12 +1029,18 @@
}
if (slot != -1) {
- if (mode == 1)
- _hFileTable[slot].open((char*)filename + r, File::kFileReadMode);
- else if (mode == 2)
- _hFileTable[slot].open((char*)filename + r, File::kFileWriteMode);
- else
- error("o60_openFile(): wrong open file mode");
+ switch(mode) {
+ case 1:
+ _hFileTable[slot].open((char*)filename + r, File::kFileReadMode, _saveFileMan->getSavePath());
+ if (_hFileTable[slot].isOpen() == false)
+ _hFileTable[slot].open((char*)filename + r, File::kFileReadMode);
+ break;
+ case 2:
+ _hFileTable[slot].open((char*)filename + r, File::kFileWriteMode, _saveFileMan->getSavePath());
+ break;
+ default:
+ error("o60_openFile(): wrong open file mode %d", mode);
+ }
if (_hFileTable[slot].isOpen() == false)
slot = -1;
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.216
retrieving revision 2.217
diff -u -d -r2.216 -r2.217
--- script_v72he.cpp 10 Mar 2005 00:46:26 -0000 2.216
+++ script_v72he.cpp 10 Mar 2005 00:50:54 -0000 2.217
@@ -24,6 +24,7 @@
#include "stdafx.h"
#include "common/config-manager.h"
+#include "common/savefile.h"
#include "common/system.h"
#include "scumm/actor.h"
@@ -32,7 +33,6 @@
#include "scumm/object.h"
#include "scumm/resource.h"
#include "scumm/resource_v7he.h"
-#include "common/savefile.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
#include "scumm/verbs.h"
More information about the Scummvm-git-logs
mailing list