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

[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:
b606d3bd8c MTROPOLIS: Fix Set But Unused Variable and Missing Switch Case GCC Warnings


Commit: b606d3bd8c0552bb3475362f6a675f26de1667ac
    https://github.com/scummvm/scummvm/commit/b606d3bd8c0552bb3475362f6a675f26de1667ac
Author: D G Turner (digitall at scummvm.org)
Date: 2022-06-21T14:42:41+01:00

Commit Message:
MTROPOLIS: Fix Set But Unused Variable and Missing Switch Case GCC Warnings

Changed paths:
    engines/mtropolis/boot.cpp


diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index 1a482487d6b..e4c11bb7682 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -575,7 +575,7 @@ Common::SharedPtr<ProjectDescription> bootProject(const MTropolisGameDescription
 		// MT2 Cross: MFmx[+MFxx]
 		bool haveAnyMFmm = false;
 		bool haveAnyMFmx = false;
-		bool haveAnyMFxx = false;
+		//bool haveAnyMFxx = false; // Unused
 		bool haveAnyMFxm = false;
 
 		for (Boot::FileIdentification &macFile : macFiles) {
@@ -591,7 +591,7 @@ Common::SharedPtr<ProjectDescription> bootProject(const MTropolisGameDescription
 					haveAnyMFxm = true;
 					break;
 				case MKTAG('M', 'F', 'x', 'x'):
-					haveAnyMFxx = true;
+					//haveAnyMFxx = true; // Unused
 					break;
 				default:
 					break;
@@ -638,6 +638,12 @@ Common::SharedPtr<ProjectDescription> bootProject(const MTropolisGameDescription
 		// Bin segments
 		for (Boot::FileIdentification &macFile : macFiles) {
 			switch (macFile.category) {
+			case Boot::kFileCategoryPlayer:
+				// Case handled below after cursor loading
+				break;
+			case Boot::kFileCategoryExtension:
+				// Case handled below after cursor loading
+				break;
 			case Boot::kFileCategoryProjectMainSegment:
 				mainSegmentFile = &macFile;
 				break;
@@ -651,6 +657,10 @@ Common::SharedPtr<ProjectDescription> bootProject(const MTropolisGameDescription
 						segmentFiles.push_back(nullptr);
 					segmentFiles[segmentIndex] = &macFile;
 				} break;
+			case Boot::kFileCategorySpecial:
+				break;
+			case Boot::kFileCategoryUnknown:
+				break;
 			}
 		}
 
@@ -803,6 +813,12 @@ Common::SharedPtr<ProjectDescription> bootProject(const MTropolisGameDescription
 		// Bin segments
 		for (Boot::FileIdentification &macFile : winFiles) {
 			switch (macFile.category) {
+			case Boot::kFileCategoryPlayer:
+				// Case handled below after cursor loading
+				break;
+			case Boot::kFileCategoryExtension:
+				// Case handled below after cursor loading
+				break;
 			case Boot::kFileCategoryProjectMainSegment:
 				mainSegmentFile = &macFile;
 				break;
@@ -816,6 +832,10 @@ Common::SharedPtr<ProjectDescription> bootProject(const MTropolisGameDescription
 					segmentFiles.push_back(nullptr);
 				segmentFiles[segmentIndex] = &macFile;
 			} break;
+			case Boot::kFileCategorySpecial:
+				break;
+			case Boot::kFileCategoryUnknown:
+				break;
 			}
 		}