From 7da4eccb1d5297d528bb664ef0d55dae9d5e58f2 Mon Sep 17 00:00:00 2001 From: Paweł Kołodziejski Date: Sun, 2 May 2004 14:03:21 +0000 Subject: enabled save/load code for imuse digital svn-id: r13746 --- scumm/imuse_digi/dimuse.cpp | 7 +------ scumm/saveload.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'scumm') 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 -- cgit v1.2.3