Ticket #8160: comivox.diff

scumm/bundle.h

@@ -44 +44 @@
         int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size, int32 index, int32 & channels);
         CompTable *_compVoiceTable;
         CompTable *_compMusicTable;
-        File _voiceFile;
         BundleAudioTable *_bundleVoiceTable;
         BundleAudioTable *_bundleMusicTable;
         int32 _numVoiceFiles;
@@ -60 +59 @@
          ~Bundle();
 
         File _musicFile;
+        File _voiceFile;
         void initializeImcTables();
         bool openVoiceFile(const char *filename, const char *directory);
         bool openMusicFile(const char *filename, const char *directory);

scumm/sound.cpp

@@ -1140 +1140 @@
         if (_scumm->_gameId == GID_CMI) {
                 char voxfile[20];
                 sprintf(voxfile, "voxdisk%d.bun", _scumm->_vars[_scumm->VAR_CURRENTDISK]);
+                if (_voiceDisk != _scumm->_vars[_scumm->VAR_CURRENTDISK])
+                        _scumm->_bundle->_voiceFile.close();
+
                 result = _scumm->_bundle->openVoiceFile(voxfile, _scumm->getGameDataPath());
+
+                _voiceDisk = (byte)_scumm->_vars[_scumm->VAR_CURRENTDISK];
         } else if (_scumm->_gameId == GID_DIG)
                 result = _scumm->_bundle->openVoiceFile("digvoice.bun", _scumm->getGameDataPath());
         else

scumm/sound.h

@@ -45 +45 @@
         char * _nameBundleMusic;
         char * _newNameBundleMusic;
         byte _musicDisk;
+        byte _voiceDisk;
         int32 _currentSampleBundleMusic;
         int32 _numberSamplesBundleMusic;
         int32 _offsetSampleBundleMusic;