[Scummvm-git-logs] scummvm master -> 51dbb8c694bf5b5b00981e7bea8f90097a164181

[sev-]

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

Summary:
51dbb8c694 SCUMM: Fix compilation with NES APU disabled


Commit: 51dbb8c694bf5b5b00981e7bea8f90097a164181
    https://github.com/scummvm/scummvm/commit/51dbb8c694bf5b5b00981e7bea8f90097a164181
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-10T22:05:38+01:00

Commit Message:
SCUMM: Fix compilation with NES APU disabled

Changed paths:
    engines/scumm/gfx_nes.cpp


diff --git a/engines/scumm/gfx_nes.cpp b/engines/scumm/gfx_nes.cpp
index 263946c5d63..7e7c8bf767e 100644
--- a/engines/scumm/gfx_nes.cpp
+++ b/engines/scumm/gfx_nes.cpp
@@ -46,11 +46,12 @@ static bool nesTitleWaitOrSkip(OSystem *system, uint32 timeoutMs) {
 	}
 }
 
+#ifndef DISABLE_NES_APU
 static void nesTitle2TwinkleStep(
 		Scumm::Player_NES *player,
 		const byte (*twinkleGroups)[4][6],
 		byte group,
-		byte step ) {
+		byte step) {
 		if (!player)
 			return;
 
@@ -60,6 +61,7 @@ static void nesTitle2TwinkleStep(
 		if (step == 0)
 			player->startTitleTwinkleGroup(twinkleGroups[group]);
 	}
+#endif
 
 static bool nesTitle2WaitOrSkipWithSpriteAnim(
 	OSystem *system,
@@ -68,7 +70,7 @@ static bool nesTitle2WaitOrSkipWithSpriteAnim(
 	const byte *backgroundFrame,
 	uint32 waitMs,
 	Scumm::ScummNESFile *nesFile,
-	Scumm::Player_NES *player ) {
+	Scumm::Player_NES *player) {
 	const uint32 startMs = system->getMillis();
 
 	struct ActiveSparkle {
@@ -94,6 +96,7 @@ static bool nesTitle2WaitOrSkipWithSpriteAnim(
 	static Common::Array<ActiveSparkle> sTitle2ActiveSparkles;
 	static Common::Array<PendingChirp> sTitle2PendingChirps;
 
+#ifndef DISABLE_NES_APU
 	static const byte kTwinkleGroups[8][4][6] = {
 		{
 			{ 0x03, 0x05, 0x00, 0x0A, 0x40, 0x04 },
@@ -144,6 +147,7 @@ static bool nesTitle2WaitOrSkipWithSpriteAnim(
 			{ 0x03, 0x05, 0x00, 0x0C, 0x40, 0x04 }
 		}
 	};
+#endif
 
 	Common::Array<byte> sparkleChr;
 	if (!nesFile || !nesFile->readTitle2SparkleChr(sparkleChr))
@@ -240,7 +244,9 @@ static bool nesTitle2WaitOrSkipWithSpriteAnim(
 				pc.framesUntilNext--;
 
 				if (pc.framesUntilNext <= 0) {
+#ifndef DISABLE_NES_APU
 					nesTitle2TwinkleStep(player, kTwinkleGroups, pc.groupIndex, pc.stepIndex);
+#endif
 					sTitle2PendingChirps.remove_at(i);
 					break;
 				}