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

[mduggan]

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:
b7bea1c927 DGDS: Fix variable shadowing


Commit: b7bea1c92736b23db06b790fa53fc12bb9f231c6
    https://github.com/scummvm/scummvm/commit/b7bea1c92736b23db06b790fa53fc12bb9f231c6
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-11-08T20:59:54+11:00

Commit Message:
DGDS: Fix variable shadowing

Changed paths:
    engines/dgds/sound.cpp


diff --git a/engines/dgds/sound.cpp b/engines/dgds/sound.cpp
index 4edab5a50f4..8af0d42d2c3 100644
--- a/engines/dgds/sound.cpp
+++ b/engines/dgds/sound.cpp
@@ -386,11 +386,11 @@ void Sound::loadSNGSoundData(const Common::String &filename, Common::Array<Sound
 	if (!filename.hasSuffixIgnoreCase(".sng"))
 		error("Unhandled SNG file type: %s", filename.c_str());
 
-	Common::SeekableReadStream *stream = _resource->getResource(filename);
-	if (!stream)
+	Common::SeekableReadStream *resstream = _resource->getResource(filename);
+	if (!resstream)
 		error("Music file %s not found", filename.c_str());
 
-	DgdsChunkReader chunk(stream);
+	DgdsChunkReader chunk(resstream);
 
 	while (chunk.readNextHeader(EX_SNG, filename)) {
 		if (chunk.isContainer()) {
@@ -422,7 +422,7 @@ void Sound::loadSNGSoundData(const Common::String &filename, Common::Array<Sound
 		}
 	}
 
-	delete stream;
+	delete resstream;
 }
 
 int Sound::mapSfxNum(int num) const {