[Scummvm-git-logs] scummvm master -> 6c8c73a2452f1384a0428633a9043738f58e94a5

[sev-]

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

Summary:
dd62844792 DGDS: Fix warning
6c8c73a245 M4: RIDDLE: Fix type


Commit: dd628447926837aed04783ffa48c6fc658305df7
    https://github.com/scummvm/scummvm/commit/dd628447926837aed04783ffa48c6fc658305df7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-23T16:18:31+02:00

Commit Message:
DGDS: Fix warning

Changed paths:
    engines/dgds/dragon_arcade_ttm.h


diff --git a/engines/dgds/dragon_arcade_ttm.h b/engines/dgds/dragon_arcade_ttm.h
index 344fe94ee3e..f84ea028a11 100644
--- a/engines/dgds/dragon_arcade_ttm.h
+++ b/engines/dgds/dragon_arcade_ttm.h
@@ -69,7 +69,7 @@ private:
 	int16 _frame;
 };
 
-struct ArcadeNPCState;
+class ArcadeNPCState;
 
 /** A TTM interpreter which is simpler than the main one and
    specialized to the arcade sequences. */


Commit: 6c8c73a2452f1384a0428633a9043738f58e94a5
    https://github.com/scummvm/scummvm/commit/6c8c73a2452f1384a0428633a9043738f58e94a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-23T16:19:38+02:00

Commit Message:
M4: RIDDLE: Fix type

Changed paths:
    engines/m4/riddle/rooms/section6/room604.cpp


diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index ebaaa04367d..ff9c380a9b9 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -551,7 +551,7 @@ void Room604::parser() {
 			break;
 
 		default:
-			false;
+			break;
 		}
 	} else if (player_said("SPARK PLUG TOOL", "plug") &&
 			inv_player_has("SPARK PLUG TOOL")) {