aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-05-02 14:03:21 +0000
committerPaweł Kołodziejski2004-05-02 14:03:21 +0000
commit7da4eccb1d5297d528bb664ef0d55dae9d5e58f2 (patch)
tree265ac2ebfa34984f7bf702d12ede47f36fb69b0a /scumm
parentf6b8830158f279c7dbee17a133ae9d1813ee4703 (diff)
downloadscummvm-rg350-7da4eccb1d5297d528bb664ef0d55dae9d5e58f2.tar.gz
scummvm-rg350-7da4eccb1d5297d528bb664ef0d55dae9d5e58f2.tar.bz2
scummvm-rg350-7da4eccb1d5297d528bb664ef0d55dae9d5e58f2.zip
enabled save/load code for imuse digital
svn-id: r13746
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse.cpp7
-rw-r--r--scumm/saveload.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 8922ea6727..73956e8ecf 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -78,9 +78,6 @@ void IMuseDigital::resetState() {
void IMuseDigital::saveOrLoad(Serializer *ser) {
Common::StackLock lock(_mutex, "IMuseDigital::saveOrLoad()");
-
- // save-load disabled
- return;
const SaveLoadEntry mainEntries[] = {
MKLINE(IMuseDigital, _volVoice, sleInt32, VER(31)),
@@ -123,14 +120,12 @@ void IMuseDigital::saveOrLoad(Serializer *ser) {
MKEND()
};
- int i;
-
ser->_ref_me = this;
ser->_save_ref = NULL;
ser->_load_ref = NULL;
ser->saveLoadEntries(this, mainEntries);
- for (i = 0; i < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; i++) {
+ for (int i = 0; i < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; i++) {
ser->saveLoadEntries(_track[i], trackEntries);
if (!ser->isSaving()) {
if (!_track[i]->used)
diff --git a/scumm/saveload.h b/scumm/saveload.h
index 456f6e9634..4b0b6146c8 100644
--- a/scumm/saveload.h
+++ b/scumm/saveload.h
@@ -32,7 +32,7 @@ namespace Scumm {
// Can be useful for other ports too :)
#define VER(x) x
-#define CURRENT_VER 30
+#define CURRENT_VER 31
// To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
// we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC