Ticket #8351: cdsound.diff

scumm/saveload.cpp

@@ -383 +383 @@
         };
 
         const SaveLoadEntry *actorEntries = Actor::getSaveLoadEntries();
+        const SaveLoadEntry *soundEntries = _sound->getSaveLoadEntries();
 
         const SaveLoadEntry verbEntries[] = {
                 MKLINE(VerbSlot, curRect.left, sleInt16, VER(8)),
@@ -672 +673 @@
         }
 
         s->saveLoadArrayOf(_actors, _numActors, sizeof(_actors[0]), actorEntries);
+        s->saveLoadEntries(_sound, soundEntries);
 
         if (savegameVersion < VER(9))
                 s->saveLoadArrayOf(vm.slot, 25, sizeof(vm.slot[0]), scriptSlotEntries);

scumm/saveload.h

@@ -32 +32 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 34
+#define CURRENT_VER 35
 
 // 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

scumm/sound.cpp

@@ -25 +25 @@
 #include "scumm/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
 #include "scumm/scumm.h"
+#include "scumm/saveload.h"
 #include "scumm/sound.h"
 
 #include "common/config-manager.h"
@@ -1120 +1121 @@
         AudioCD.updateCD();
 }
 
+const SaveLoadEntry *Sound::getSaveLoadEntries() {
+        static const SaveLoadEntry soundEntries[] = {
+                MKLINE(Sound, _currentCDSound, sleInt16, VER(35)),
+                MKEND()
+        };
+
+        return soundEntries;
+}
+
 } // End of namespace Scumm

scumm/sound.h

@@ -32 +32 @@
 class ScummFile;
 
 struct MP3OffsetTable;
+struct SaveLoadEntry;
 
 enum {
         kTalkSoundID = 10000
@@ -72 +73 @@
 
         int _overrideFreq;
 
-        int _currentCDSound;
+        int16 _currentCDSound;
         int _currentMusic;
 public:
         PlayingSoundHandle _talkChannelHandle;  // Handle of mixer channel actor is talking on
@@ -110 +111 @@
         void updateCD();
         int getCurrentCDSound() const { return _currentCDSound; }
 
+        // Used by the save/load system:
+        const SaveLoadEntry *getSaveLoadEntries();
+
 protected:
         ScummFile *openSfxFile();
         void startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, int id = -1);