[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.465,1.466
Max Horn
fingolfin at users.sourceforge.net
Fri Nov 26 17:15:55 CET 2004
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24926/simon
Modified Files:
simon.cpp
Log Message:
Moved Engine::getSavePath() to class SaveFileManager; removed the 'directory' parameter from SaveFileManager::openSavefile and listSavefiles (they always use getSavePath() now, which is what we did anyway)
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -d -r1.465 -r1.466
--- simon.cpp 24 Nov 2004 00:14:16 -0000 1.465
+++ simon.cpp 27 Nov 2004 00:25:59 -0000 1.466
@@ -2733,12 +2733,11 @@
char *prefix = gen_savename(999);
prefix[strlen(prefix)-3] = '\0';
- _saveFileMan->list_savefiles(prefix, getSavePath(), marks, 256);
+ _saveFileMan->listSavefiles(prefix, marks, 256);
while (i < 256) {
if (marks[i] &&
- (f = _saveFileMan->open_savefile(gen_savename(i), getSavePath(),
- false))) {
+ (f = _saveFileMan->openSavefile(gen_savename(i), false))) {
i++;
delete f;
} else
@@ -2758,7 +2757,7 @@
slot = curpos;
while (curpos + 6 > slot) {
- if(!(in = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), false)))
+ if(!(in = _saveFileMan->openSavefile(gen_savename(slot), false)))
break;
in->read(dst, 18);
@@ -2782,7 +2781,7 @@
}
} else {
if (curpos + 6 == slot) {
- if((in = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), false))) {
+ if((in = _saveFileMan->openSavefile(gen_savename(slot), false))) {
slot++;
delete in;
}
@@ -4917,7 +4916,7 @@
#endif
- f = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), true);
+ f = _saveFileMan->openSavefile(gen_savename(slot), true);
if (f == NULL) {
_lock_word &= ~0x100;
return false;
@@ -5018,7 +5017,7 @@
#endif
- f = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), false);
+ f = _saveFileMan->openSavefile(gen_savename(slot), false);
if (f == NULL) {
_lock_word &= ~0x100;
return false;
More information about the Scummvm-git-logs
mailing list