[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.155,1.156 scumm.h,1.410,1.411

Max Horn fingolfin at users.sourceforge.net
Fri Jun 25 14:49:01 CEST 2004


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

Modified Files:
	saveload.cpp scumm.h 
Log Message:
cleanup

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- saveload.cpp	2 May 2004 10:07:59 -0000	1.155
+++ saveload.cpp	25 Jun 2004 21:48:12 -0000	1.156
@@ -38,6 +38,7 @@
 #include "sound/audiocd.h"
 #include "sound/mixer.h"
 
+#include <memory>
 
 namespace Scumm {
 
@@ -63,7 +64,9 @@
 	_saveLoadFlag = 2;		// 2 for load
 }
 
-bool ScummEngine::saveState(int slot, bool compat, SaveFileManager *mgr) {
+bool ScummEngine::saveState(int slot, bool compat) {
+	const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
+
 	char filename[256];
 	SaveFile *out;
 	SaveGameHeader hdr;
@@ -88,7 +91,9 @@
 	return true;
 }
 
-bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
+bool ScummEngine::loadState(int slot, bool compat) {
+	const std::auto_ptr<SaveFileManager> mgr(_system->get_savefile_manager());
+
 	char filename[256];
 	SaveFile *in;
 	int i, j;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -d -r1.410 -r1.411
--- scumm.h	25 Jun 2004 10:39:35 -0000	1.410
+++ scumm.h	25 Jun 2004 21:48:12 -0000	1.411
@@ -507,20 +507,8 @@
 	bool _saveTemporaryState;
 	char _saveLoadName[32];
 
-	bool saveState(int slot, bool compat, SaveFileManager *mgr);
-	bool loadState(int slot, bool compat, SaveFileManager *mgr);
-	bool saveState(int slot, bool compat) {
-		SaveFileManager *mgr = _system->get_savefile_manager();
-		bool result = saveState(slot, compat, mgr);
-		delete mgr;
-		return result;
-	}
-	bool loadState(int slot, bool compat) {
-		SaveFileManager *mgr = _system->get_savefile_manager();
-		bool result = loadState(slot, compat, mgr);
-		delete mgr;
-		return result;
-	}
+	bool saveState(int slot, bool compat);
+	bool loadState(int slot, bool compat);
 	void saveOrLoad(Serializer *s, uint32 savegameVersion);
 	void saveLoadResource(Serializer *ser, int type, int index);	// "Obsolete"
 	void saveResource(Serializer *ser, int type, int index);





More information about the Scummvm-git-logs mailing list