Add patch #999887 - Possible fix for bug #998276

Also saves _currentMusic

svn-id: r14525

1 files changed, 6 insertions, 2 deletions

diff --git a/scumm/sound.h b/scumm/sound.h
index b354ac255c..d426e9c625 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -32,6 +32,7 @@ class ScummEngine;
 class ScummFile;
 
 struct MP3OffsetTable;
+struct SaveLoadEntry;
 
 enum {
 	kTalkSoundID = 10000
@@ -72,8 +73,8 @@ protected:
 
 	int _overrideFreq;
 
-	int _currentCDSound;
-	int _currentMusic;
+	int16 _currentCDSound;
+	int16 _currentMusic;
 public:
 	PlayingSoundHandle _talkChannelHandle;	// Handle of mixer channel actor is talking on
 	PlayingSoundHandle _musicChannelHandle;	// Handle of mixer channel music is on
@@ -110,6 +111,9 @@ public:
 	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);