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

[dwatteau]

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

Summary:
ddb8a24dec SLUDGE: JANITORIAL: Silence -Wpedantic warning about extra ';'
c32a680462 NANCY: JANITORIAL: Move "fall through" comment just before the `case`


Commit: ddb8a24dec616b4fe81b97db1da9db412f78fd77
    https://github.com/scummvm/scummvm/commit/ddb8a24dec616b4fe81b97db1da9db412f78fd77
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-03-25T19:21:51+01:00

Commit Message:
SLUDGE: JANITORIAL: Silence -Wpedantic warning about extra ';'

Changed paths:
    engines/sludge/savedata.cpp


diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index e89e4f29caf..ab1bbe19c41 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -33,7 +33,7 @@
 namespace Sludge {
 
 const char CustomSaveHelper::UTF8_CHECKER[] = {'U', 'N', '\xef', '\xbf', '\xbd', 'L', 'O', '\xef', '\xbf', '\xbd', 'C', 'K', 'E', 'D', '\0'};
-const char CustomSaveHelper::CP1252_CHECKER[] = {'U', 'N', '\xA3', 'L', 'O', '\xE5', 'C', 'K', 'E', 'D', '\0'};;
+const char CustomSaveHelper::CP1252_CHECKER[] = {'U', 'N', '\xA3', 'L', 'O', '\xE5', 'C', 'K', 'E', 'D', '\0'};
 uint16 CustomSaveHelper::_saveEncoding = false;
 char CustomSaveHelper::_encode1 = 0;
 char CustomSaveHelper::_encode2 = 0;


Commit: c32a680462b45c2fdcc4aeaa5c6cac139f6f0ee5
    https://github.com/scummvm/scummvm/commit/c32a680462b45c2fdcc4aeaa5c6cac139f6f0ee5
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-03-25T19:21:51+01:00

Commit Message:
NANCY: JANITORIAL: Move "fall through" comment just before the `case`

GCC 7.5.0 patterns for "fall through" comments didn't like seeing a
closing `}` just before the intended `case`.

Changed paths:
    engines/nancy/action/puzzle/quizpuzzle.cpp


diff --git a/engines/nancy/action/puzzle/quizpuzzle.cpp b/engines/nancy/action/puzzle/quizpuzzle.cpp
index c3f2c12bf27..3ca412e4fe1 100644
--- a/engines/nancy/action/puzzle/quizpuzzle.cpp
+++ b/engines/nancy/action/puzzle/quizpuzzle.cpp
@@ -516,8 +516,8 @@ void QuizPuzzle::execute() {
 		drawText();
 
 		_state = kRun;
-		// fall through
 	}
+		// fall through
 	case kRun:
 		if (g_nancy->getGameType() == kGameTypeNancy8)
 			executeOld();