[Scummvm-git-logs] scummvm master -> 922d952f899e6b53a1b18f84b7479910b0f7bf8b

[digitall]

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:
922d952f89 SCUMM: Fix Shadowing GCC Compiler Warnings


Commit: 922d952f899e6b53a1b18f84b7479910b0f7bf8b
    https://github.com/scummvm/scummvm/commit/922d952f899e6b53a1b18f84b7479910b0f7bf8b
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-24T02:52:27Z

Commit Message:
SCUMM: Fix Shadowing GCC Compiler Warnings

Changed paths:
    engines/scumm/imuse/drivers/macintosh.cpp


diff --git a/engines/scumm/imuse/drivers/macintosh.cpp b/engines/scumm/imuse/drivers/macintosh.cpp
index 7163a1b7320..8dd0ecba19c 100644
--- a/engines/scumm/imuse/drivers/macintosh.cpp
+++ b/engines/scumm/imuse/drivers/macintosh.cpp
@@ -36,7 +36,7 @@ using namespace Scumm;
 
 struct ChanControlNode;
 struct DeviceChannel {
-	DeviceChannel(const uint32 *pitchTable) : pitchTable(pitchTable), frequency(0), phase(0), end(nullptr), pos(nullptr), smpBuffStart(nullptr),
+	DeviceChannel(const uint32 *_pitchTable) : pitchTable(_pitchTable), frequency(0), phase(0), end(nullptr), pos(nullptr), smpBuffStart(nullptr),
 		smpBuffEnd(nullptr), loopStart(nullptr), loopEnd(nullptr), pitch(0), mute(true), release(false), instr(nullptr),
 		prog(0), baseFreq(0), note(0), volumeL(0), volumeR(0), rate(0), totalLevelL(0), totalLevelR(0), node(nullptr), prev(nullptr), next(nullptr) {}
 	~DeviceChannel() {}