[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.434,1.435
Max Horn
fingolfin at users.sourceforge.net
Fri Jun 25 15:40:03 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.249,2.250 script_v5.cpp,1.238,1.239 dialogs.cpp,1.111,1.112
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky control.h,1.31,1.32 control.cpp,1.70,1.71 sky.cpp,1.143,1.144
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14375/simon
Modified Files:
simon.cpp
Log Message:
Added Engine::_saveFileMan; thus was able to get rid of auto_ptr usage again
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -d -r1.434 -r1.435
--- simon.cpp 25 Jun 2004 22:12:56 -0000 1.434
+++ simon.cpp 25 Jun 2004 22:39:20 -0000 1.435
@@ -42,8 +42,6 @@
#include <errno.h>
#include <time.h>
-#include <memory>
-
#ifdef __PALM_OS__
#include "globals.h"
#endif
@@ -2625,15 +2623,13 @@
uint i = 1;
bool marks[256];
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
char *prefix = gen_savename(999);
prefix[strlen(prefix)-3] = '\0';
- mgr->list_savefiles(prefix, getSavePath(), marks, 256);
+ _saveFileMan->list_savefiles(prefix, getSavePath(), marks, 256);
while (i < 256) {
if (marks[i] &&
- (f = mgr->open_savefile(gen_savename(i), getSavePath(),
+ (f = _saveFileMan->open_savefile(gen_savename(i), getSavePath(),
false))) {
i++;
delete f;
@@ -2653,11 +2649,8 @@
slot = curpos;
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
-
while (curpos + 6 > slot) {
- if(!(in = mgr->open_savefile(gen_savename(slot), getSavePath(), false)))
+ if(!(in = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), false)))
break;
in->read(dst, 18);
@@ -2681,7 +2674,7 @@
}
} else {
if (curpos + 6 == slot) {
- if((in = mgr->open_savefile(gen_savename(slot), getSavePath(), false))) {
+ if((in = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), false))) {
slot++;
delete in;
}
@@ -4807,10 +4800,8 @@
errno = 0;
#endif
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
- f = mgr->open_savefile(gen_savename(slot), getSavePath(), true);
+ f = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), true);
if (f == NULL) {
_lock_word &= ~0x100;
return false;
@@ -4910,10 +4901,8 @@
errno = 0;
#endif
- const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
-
- f = mgr->open_savefile(gen_savename(slot), getSavePath(), false);
+ f = _saveFileMan->open_savefile(gen_savename(slot), getSavePath(), false);
if (f == NULL) {
_lock_word &= ~0x100;
return false;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.249,2.250 script_v5.cpp,1.238,1.239 dialogs.cpp,1.111,1.112
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky control.h,1.31,1.32 control.cpp,1.70,1.71 sky.cpp,1.143,1.144
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list