[Scummvm-cvs-logs] SF.net SVN: scummvm:[33606] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Aug 4 13:38:27 CEST 2008
Revision: 33606
http://scummvm.svn.sourceforge.net/scummvm/?rev=33606&view=rev
Author: fingolfin
Date: 2008-08-04 11:38:25 +0000 (Mon, 04 Aug 2008)
Log Message:
-----------
Turned InSaveFile & OutSaveFile into simple typedefs
Modified Paths:
--------------
scummvm/trunk/common/savefile.h
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/queen/queen.h
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/scumm/saveload.h
scummvm/trunk/engines/scumm/scumm.h
Modified: scummvm/trunk/common/savefile.h
===================================================================
--- scummvm/trunk/common/savefile.h 2008-08-04 11:32:42 UTC (rev 33605)
+++ scummvm/trunk/common/savefile.h 2008-08-04 11:38:25 UTC (rev 33606)
@@ -39,16 +39,14 @@
* That typically means "save games", but also includes things like the
* IQ points in Indy3.
*/
-//typedef SeekableReadStream InSaveFile;
-class InSaveFile : public SeekableReadStream {};
+typedef SeekableReadStream InSaveFile;
/**
* A class which allows game engines to save game state data.
* That typically means "save games", but also includes things like the
* IQ points in Indy3.
*/
-//typedef WriteStream OutSaveFile;
-class OutSaveFile : public WriteStream {};
+typedef WriteStream OutSaveFile;
/**
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2008-08-04 11:32:42 UTC (rev 33605)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2008-08-04 11:38:25 UTC (rev 33606)
@@ -34,8 +34,8 @@
#include "kyra/script.h"
namespace Common {
-class InSaveFile;
-class OutSaveFile;
+class SeekableReadStream;
+class WriteStream;
} // end of namespace Common
class KyraMetaEngine;
@@ -299,10 +299,10 @@
kRSHEIoError = 3
};
- static kReadSaveHeaderError readSaveHeader(Common::InSaveFile *file, SaveHeader &header);
+ static kReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *file, SaveHeader &header);
- Common::InSaveFile *openSaveForReading(const char *filename, SaveHeader &header);
- Common::OutSaveFile *openSaveForWriting(const char *filename, const char *saveName) const;
+ Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header);
+ Common::WriteStream *openSaveForWriting(const char *filename, const char *saveName) const;
};
} // End of namespace Kyra
Modified: scummvm/trunk/engines/queen/queen.h
===================================================================
--- scummvm/trunk/engines/queen/queen.h 2008-08-04 11:32:42 UTC (rev 33605)
+++ scummvm/trunk/engines/queen/queen.h 2008-08-04 11:38:25 UTC (rev 33606)
@@ -29,7 +29,7 @@
#include "engines/engine.h"
namespace Common {
- class InSaveFile;
+ class SeekableReadStream;
}
#if defined(_WIN32_WCE) && (_WIN32_WCE <= 300)
@@ -112,7 +112,7 @@
void makeGameStateName(int slot, char *buf) const;
int getGameStateSlot(const char *filename) const;
void findGameStateDescriptions(char descriptions[100][32]);
- Common::InSaveFile *readGameStateHeader(int slot, GameStateHeader *gsh);
+ Common::SeekableReadStream *readGameStateHeader(int slot, GameStateHeader *gsh);
enum {
SAVESTATE_CUR_VER = 1,
Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp 2008-08-04 11:32:42 UTC (rev 33605)
+++ scummvm/trunk/engines/scumm/saveload.cpp 2008-08-04 11:38:25 UTC (rev 33606)
@@ -595,7 +595,7 @@
return true;
}
-void ScummEngine::saveInfos(Common::OutSaveFile* file) {
+void ScummEngine::saveInfos(Common::WriteStream* file) {
SaveInfoSection section;
section.type = MKID_BE('INFO');
section.version = INFOSECTION_VERSION;
Modified: scummvm/trunk/engines/scumm/saveload.h
===================================================================
--- scummvm/trunk/engines/scumm/saveload.h 2008-08-04 11:32:42 UTC (rev 33605)
+++ scummvm/trunk/engines/scumm/saveload.h 2008-08-04 11:38:25 UTC (rev 33606)
@@ -31,7 +31,7 @@
namespace Common {
class SeekableReadStream;
- class OutSaveFile;
+ class WriteStream;
}
namespace Scumm {
@@ -125,7 +125,7 @@
class Serializer {
public:
- Serializer(Common::SeekableReadStream *in, Common::OutSaveFile *out, uint32 savegameVersion)
+ Serializer(Common::SeekableReadStream *in, Common::WriteStream *out, uint32 savegameVersion)
: _loadStream(in), _saveStream(out),
_savegameVersion(savegameVersion)
{ }
@@ -151,7 +151,7 @@
protected:
Common::SeekableReadStream *_loadStream;
- Common::OutSaveFile *_saveStream;
+ Common::WriteStream *_saveStream;
uint32 _savegameVersion;
void saveArrayOf(void *b, int len, int datasize, byte filetype);
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2008-08-04 11:32:42 UTC (rev 33605)
+++ scummvm/trunk/engines/scumm/scumm.h 2008-08-04 11:38:25 UTC (rev 33606)
@@ -46,7 +46,7 @@
using GUI::Dialog;
namespace Common {
class SeekableReadStream;
- class OutSaveFile;
+ class WriteStream;
}
namespace Scumm {
@@ -637,8 +637,8 @@
protected:
Graphics::Surface *loadThumbnail(Common::SeekableReadStream *file);
bool loadInfos(Common::SeekableReadStream *file, InfoStuff *stuff);
- void saveThumbnail(Common::OutSaveFile *file);
- void saveInfos(Common::OutSaveFile* file);
+ void saveThumbnail(Common::WriteStream *file);
+ void saveInfos(Common::WriteStream* file);
int32 _engineStartTime;
int32 _pauseStartTime;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list