[Scummvm-git-logs] scummvm master -> e5bebb479d5d3c05caf572683535c085fee32f69

digitall noreply at scummvm.org
Tue Jan 7 22:29:40 UTC 2025


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:
e5bebb479d SCUMM: Fix Various Compiler Warnings


Commit: e5bebb479d5d3c05caf572683535c085fee32f69
    https://github.com/scummvm/scummvm/commit/e5bebb479d5d3c05caf572683535c085fee32f69
Author: D G Turner (digitall at scummvm.org)
Date: 2025-01-07T22:29:10Z

Commit Message:
SCUMM: Fix Various Compiler Warnings

Changed paths:
    engines/scumm/soundse.cpp


diff --git a/engines/scumm/soundse.cpp b/engines/scumm/soundse.cpp
index 6481b6fd6a0..0e9b9b10158 100644
--- a/engines/scumm/soundse.cpp
+++ b/engines/scumm/soundse.cpp
@@ -107,7 +107,7 @@ void SoundSE::initSoundFiles() {
 }
 
 Audio::SeekableAudioStream *SoundSE::getXWBTrack(int track) {
-	if (track < 0 || track >= _musicEntries.size())
+	if (track < 0 || track >= (int)_musicEntries.size())
 		return nullptr;
 
 	Common::File *cdAudioFile = new Common::File();
@@ -258,7 +258,7 @@ void SoundSE::indexXSBFile(const Common::String &filename, AudioIndex *audioInde
 		Common::String name = f->readString(0);
 		name.toLowercase();
 
-		if (index >= 0 && index < (*audioIndex).size()) {
+		if (/*index >= 0 && */index < (*audioIndex).size()) {
 			(*audioIndex)[index].name = name;
 			_nameToIndex[name] = index;
 		}
@@ -853,7 +853,7 @@ int32 SoundSE::handleRemasteredSpeech(const char *msgString, const char *speechF
 		numWaits
 	);
 
-	if (entryIndex >= 0 && entryIndex < _audioEntriesMI.size()) {
+	if (entryIndex >= 0 && entryIndex < (int32)_audioEntriesMI.size()) {
 		const AudioEntryMI *entry = &_audioEntriesMI[entryIndex];
 		//debug("Selected entry: %s (%s)", entry->textEnglish.c_str(), entry->speechFile.c_str());
 		return _nameToIndex[entry->speechFile];




More information about the Scummvm-git-logs mailing list