[Scummvm-cvs-logs] CVS: scummvm/backends/dc vmsave.cpp,1.8,1.9

[Marcus Comstedt]

Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1:/tmp/cvs-serv7711/backends/dc

Modified Files:
	vmsave.cpp 
Log Message:
Harmonized SaveFile API with File API a bit.

Index: vmsave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/vmsave.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vmsave.cpp	18 Jun 2003 21:15:08 -0000	1.8
+++ vmsave.cpp	10 Aug 2003 20:49:12 -0000	1.9
@@ -224,6 +224,10 @@
   int pos, size;
   char filename[16];
 
+protected:
+  virtual int fread(void *buf, int size, int cnt);
+  virtual int fwrite(const void *buf, int size, int cnt);
+
 public:
   VMSave(const char *_filename, bool _saveOrLoad) 
     : issave(_saveOrLoad), pos(0), buffer(NULL)
@@ -235,9 +239,6 @@
 
   ~VMSave();
 
-  virtual int fread(void *buf, int size, int cnt);
-  virtual int fwrite(void *buf, int size, int cnt);
-
   bool readSaveGame()
   { return ::readSaveGame(buffer, size, filename); }
 
@@ -257,11 +258,11 @@
 };
 
 class VMSaveManager : public SaveFileManager {
-  virtual SaveFile *open_savefile(const char *filename, bool saveOrLoad);
-  virtual void list_savefiles(const char *prefix, bool *marks, int num);
+  virtual SaveFile *open_savefile(const char *filename, const char *directory, bool saveOrLoad);
+  virtual void list_savefiles(const char *prefix, const char *directory, bool *marks, int num);
 };
 
-SaveFile *VMSaveManager::open_savefile(const char *filename,
+SaveFile *VMSaveManager::open_savefile(const char *filename, const char *directory,
 				       bool saveOrLoad)
 {
   VMSave *s = new VMSave(filename, saveOrLoad);
@@ -314,7 +315,7 @@
   return cnt;
 }
 
-int VMSave::fwrite(void *buf, int sz, int cnt)
+int VMSave::fwrite(const void *buf, int sz, int cnt)
 {
   if (!issave)
     return -1;
@@ -331,7 +332,7 @@
 }
 
 
-void VMSaveManager::list_savefiles(const char *prefix,
+void VMSaveManager::list_savefiles(const char *prefix, const char *directory,
 				   bool *marks, int num)
 {
   memset(marks, false, num*sizeof(bool));