[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.244,1.245 sound.cpp,1.485,1.486 sound.h,1.93,1.94
Max Horn
fingolfin at users.sourceforge.net
Fri Oct 21 16:07:05 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.382,1.383 actor.h,1.86,1.87 imuse.cpp,2.148,2.149 saveload.cpp,1.243,1.244 saveload.h,1.67,1.68
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.455,1.456
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20931
Modified Files:
saveload.cpp sound.cpp sound.h
Log Message:
Turn class Sound into a Serializable
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- saveload.cpp 21 Oct 2005 23:01:13 -0000 1.244
+++ saveload.cpp 21 Oct 2005 23:04:58 -0000 1.245
@@ -625,8 +625,6 @@
MKEND()
};
- const SaveLoadEntry *soundEntries = _sound->getSaveLoadEntries();
-
const SaveLoadEntry verbEntries[] = {
MKLINE(VerbSlot, curRect.left, sleInt16, VER(8)),
MKLINE(VerbSlot, curRect.top, sleInt16, VER(8)),
@@ -957,7 +955,7 @@
//
// Save/load sound data
//
- s->saveLoadEntries(_sound, soundEntries);
+ _sound->saveLoadWithSerializer(s);
//
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- sound.cpp 21 Oct 2005 02:00:12 -0000 1.485
+++ sound.cpp 21 Oct 2005 23:04:58 -0000 1.486
@@ -25,7 +25,6 @@
#include "scumm/imuse.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/scumm.h"
-#include "scumm/saveload.h"
#include "scumm/sound.h"
#include "scumm/util.h"
@@ -1296,14 +1295,14 @@
AudioCD.updateCD();
}
-const SaveLoadEntry *Sound::getSaveLoadEntries() {
+void Sound::saveLoadWithSerializer(Serializer *ser) {
static const SaveLoadEntry soundEntries[] = {
MKLINE(Sound, _currentCDSound, sleInt16, VER(35)),
MKLINE(Sound, _currentMusic, sleInt16, VER(35)),
MKEND()
};
- return soundEntries;
+ ser->saveLoadEntries(this, soundEntries);
}
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- sound.h 18 Oct 2005 01:30:21 -0000 1.93
+++ sound.h 21 Oct 2005 23:04:58 -0000 1.94
@@ -24,6 +24,7 @@
#include "common/scummsys.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
+#include "scumm/saveload.h"
namespace Common {
class File;
@@ -41,7 +42,7 @@
kTalkSoundID = 10000
};
-class Sound {
+class Sound : public Serializable {
#ifdef PALMOS_MODE
public:
#else
@@ -137,7 +138,7 @@
bool getHEMusicDetails(int id, int &musicOffs, int &musicSize);
// Used by the save/load system:
- const SaveLoadEntry *getSaveLoadEntries();
+ void saveLoadWithSerializer(Serializer *ser);
protected:
ScummFile *openSfxFile();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.382,1.383 actor.h,1.86,1.87 imuse.cpp,2.148,2.149 saveload.cpp,1.243,1.244 saveload.h,1.67,1.68
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.455,1.456
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list