[Scummvm-git-logs] scummvm master -> 962dbe546afcdcf310bd011b24060379822c5f67

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
962dbe546a SCUMM: Fix DOTT Remastered offsets


Commit: 962dbe546afcdcf310bd011b24060379822c5f67
    https://github.com/scummvm/scummvm/commit/962dbe546afcdcf310bd011b24060379822c5f67
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2024-12-31T00:16:44+02:00

Commit Message:
SCUMM: Fix DOTT Remastered offsets

Changed paths:
    engines/scumm/sound.cpp
    engines/scumm/soundse.cpp


diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 5ee7a29bb7d..2255fae9706 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -458,6 +458,7 @@ void Sound::startTalkSound(uint32 offset, uint32 length, int mode, Audio::SoundH
 	int id = -1;
 	int size = 0;
 	Common::ScopedPtr<ScummFile> file;
+	uint32 origOffset = offset;
 
 	if (_vm->_game.id == GID_CMI || (_vm->_game.id == GID_DIG && !(_vm->_game.features & GF_DEMO))) {
 		// COMI (full & demo), DIG (full)
@@ -762,7 +763,7 @@ void Sound::startTalkSound(uint32 offset, uint32 length, int mode, Audio::SoundH
 
 			if (!input && _soundSE && _useRemasteredAudio) {
 				input = _soundSE->getAudioStream(
-					offset,
+					origOffset,
 					mode == DIGI_SND_MODE_SFX ? kSoundSETypeSFX : kSoundSETypeSpeech
 				);
 			}
diff --git a/engines/scumm/soundse.cpp b/engines/scumm/soundse.cpp
index f7ffcbacffe..db33718da03 100644
--- a/engines/scumm/soundse.cpp
+++ b/engines/scumm/soundse.cpp
@@ -323,7 +323,7 @@ void SoundSE::indexFSBFile(const Common::String &filename, AudioIndex *audioInde
 			continue;
 		}
 
-		const uint32 origOffset = _audioNameToOriginalOffsetMap[name] & 0xFFFFFF00;
+		const uint32 origOffset = _audioNameToOriginalOffsetMap[name];
 		_offsetToIndex[origOffset] = i;
 		//debug("indexFSBFile: %s -> offset %d, index %d", name.c_str(), origOffset, i);
 	}
@@ -508,7 +508,7 @@ void SoundSE::initAudioMapping() {
 		if (_vm->_game.id == GID_FT)
 			f->skip(4); // unknown flag
 
-		_audioNameToOriginalOffsetMap[name] = origOffset + 10;
+		_audioNameToOriginalOffsetMap[name] = origOffset;
 	} while (!f->eos());
 
 	f->close();
@@ -570,17 +570,11 @@ Audio::SeekableAudioStream *SoundSE::createSoundStream(Common::SeekableSubReadSt
 }
 
 int32 SoundSE::getSoundIndexFromOffset(uint32 offset) {
-	uint32 offsetToCheck = offset;
-
 	if (_vm->_game.id == GID_MONKEY || _vm->_game.id == GID_MONKEY2) {
 		return offset;
 	} else if (_vm->_game.id == GID_TENTACLE) {
-		// Some of the remastered sound offsets are off compared to the
-		// ones from the classic version, so we chop off the last 2 digits
-		offsetToCheck = offset & 0xFFFFFF00;
-
-		if (_offsetToIndex.contains(offsetToCheck))
-			return _offsetToIndex[offsetToCheck];
+		if (_offsetToIndex.contains(offset))
+			return _offsetToIndex[offset];
 		else
 			return -1;
 	}