[Scummvm-git-logs] scummvm master -> 9382f3c24d83cf0c4963a4df4fb01b8c9d614a04

[eriktorbjorn]

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:
60ea0ff71d SCUMM: Rename options variables to better reflect their purpose
9382f3c24d SCUMM: Change spaces to tabs


Commit: 60ea0ff71dad1810e8915f76bdd582daf30e17a2
    https://github.com/scummvm/scummvm/commit/60ea0ff71dad1810e8915f76bdd582daf30e17a2
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-09-11T22:09:32+02:00

Commit Message:
SCUMM: Rename options variables to better reflect their purpose

I assume the "ObjectLabels" bit was cut and pasted from the one option
that actually had anything to do with object labels.

Changed paths:
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index fb30aa311b2..5273ad239f7 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -650,7 +650,7 @@ static const ExtraGuiOption comiObjectLabelsOption = {
 	0
 };
 
-static const ExtraGuiOption mmnesObjectLabelsOption = {
+static const ExtraGuiOption mmnesClassicPaletteOption = {
 	_s("Use NES Classic Palette"),
 	_s("Use a more neutral color palette that closely emulates the NES Classic"),
 	"mm_nes_classic_palette",
@@ -761,7 +761,7 @@ static const ExtraGuiOption enableCopyProtection = {
 	0
 };
 
-static const ExtraGuiOption mmDemoObjectLabelsOption = {
+static const ExtraGuiOption mmDemoModeOption = {
 	_s("Enable demo/kiosk mode"),
 	_s("Enable demo/kiosk mode in the full retail version of Maniac Mansion."),
 	"enable_demo_mode",
@@ -803,7 +803,7 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 		}
 	}
 	if (target.empty() || platform == Common::kPlatformNES) {
-		options.push_back(mmnesObjectLabelsOption);
+		options.push_back(mmnesClassicPaletteOption);
 	}
 	if (target.empty() || platform == Common::kPlatformFMTowns) {
 		options.push_back(smoothScrolling);
@@ -825,7 +825,7 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 			 !guiOptionsString.contains("lang_Italian");
 
 		if (isValidTarget)
-			options.push_back(mmDemoObjectLabelsOption);
+			options.push_back(mmDemoModeOption);
     }
 	// The Steam Mac versions of Loom and Indy 3 are more akin to the VGA
 	// DOS versions, and that's how ScummVM usually sees them. But that


Commit: 9382f3c24d83cf0c4963a4df4fb01b8c9d614a04
    https://github.com/scummvm/scummvm/commit/9382f3c24d83cf0c4963a4df4fb01b8c9d614a04
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-09-11T22:13:03+02:00

Commit Message:
SCUMM: Change spaces to tabs

Changed paths:
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 5273ad239f7..06cbe8aea56 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -816,9 +816,9 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 			options.push_back(fmtownsForceHiResMode);
 #endif
 	}
-    if (target.empty() || gameid == "maniac") {
+	if (target.empty() || gameid == "maniac") {
 		// The kiosk demo script is in V1/V2 DOS, V2 Atari ST and V2 Amiga.
-        bool isValidTarget = !extra.contains("Demo") &&
+		bool isValidTarget = !extra.contains("Demo") &&
 			(platform == Common::kPlatformDOS   ||
 			 platform == Common::kPlatformAmiga ||
 			 platform == Common::kPlatformAtariST) &&
@@ -826,7 +826,7 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 
 		if (isValidTarget)
 			options.push_back(mmDemoModeOption);
-    }
+	}
 	// The Steam Mac versions of Loom and Indy 3 are more akin to the VGA
 	// DOS versions, and that's how ScummVM usually sees them. But that
 	// rebranding does not happen until later.