[Scummvm-git-logs] scummvm master -> 013209615b2754c98ed7e9cfab73d363716f8c98

[elasota]

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:
013209615b MTROPOLIS: Fix save-at-checkpoints and gameplay subtitles option IDs being swapped, rename gameplay subtitles option


Commit: 013209615b2754c98ed7e9cfab73d363716f8c98
    https://github.com/scummvm/scummvm/commit/013209615b2754c98ed7e9cfab73d363716f8c98
Author: elasota (ejlasota at gmail.com)
Date: 2022-08-10T19:16:22-04:00

Commit Message:
MTROPOLIS: Fix save-at-checkpoints and gameplay subtitles option IDs being swapped, rename gameplay subtitles option

Changed paths:
    engines/mtropolis/detection.cpp
    engines/mtropolis/detection_tables.h


diff --git a/engines/mtropolis/detection.cpp b/engines/mtropolis/detection.cpp
index 25a02eca970..0a634e96daf 100644
--- a/engines/mtropolis/detection.cpp
+++ b/engines/mtropolis/detection.cpp
@@ -60,7 +60,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		}
 	},
 	{
-		GAMEOPTION_SOUND_GAMEPLAY_SUBTITLES,
+		GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS,
 		{
 			_s("Autosave at progress points"),
 			_s("Automatically saves the game after completing puzzles and chapters."),
@@ -74,7 +74,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_ENABLE_SHORT_TRANSITIONS,
 		{
 			_s("Enable short transitions"),
-			_s("Enables transitions that are set to maximum rate instead of skipping them"),
+			_s("Enables transitions that are set to maximum rate instead of skipping them."),
 			"mtropolis_mod_minimum_transition_duration",
 			true,
 			0,
@@ -82,10 +82,10 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		}
 	},
 	{
-		GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS,
+		GAMEOPTION_SOUND_GAMEPLAY_SUBTITLES,
 		{
-			_s("Use subtitles for sound-based gameplay elements"),
-			_s("Enables subtitles for gameplay elements that depend on hearing an audible sound."),
+			_s("Enable subtitles for important sound effects"),
+			_s("Enables subtitles for important sound effects.  This may reduce the difficulty of sound recognition puzzles and minigames."),
 			"mtropolis_mod_sound_gameplay_subtitles",
 			false,
 			0,
@@ -96,7 +96,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 		GAMEOPTION_LAUNCH_DEBUG,
 		{
 			_s("Start with debugger"),
-			_s("Starts with the debugger dashboard active"),
+			_s("Starts with the debugger dashboard active."),
 			"mtropolis_debug_at_start",
 			false,
 			0,
diff --git a/engines/mtropolis/detection_tables.h b/engines/mtropolis/detection_tables.h
index ac1e262a232..adc507bad5d 100644
--- a/engines/mtropolis/detection_tables.h
+++ b/engines/mtropolis/detection_tables.h
@@ -29,7 +29,7 @@
 #define GAMEOPTION_WIDESCREEN_MOD				GUIO_GAMEOPTIONS1
 #define GAMEOPTION_DYNAMIC_MIDI					GUIO_GAMEOPTIONS2
 #define GAMEOPTION_LAUNCH_DEBUG					GUIO_GAMEOPTIONS3
-#define GAMEOPTION_SOUND_GAMEPLAY_SUBTITLES		GUIO_GAMEOPTIONS4
+#define GAMEOPTION_SOUND_EFFECT_SUBTITLES		GUIO_GAMEOPTIONS4
 #define GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS		GUIO_GAMEOPTIONS5
 #define GAMEOPTION_ENABLE_SHORT_TRANSITIONS		GUIO_GAMEOPTIONS6
 
@@ -53,7 +53,7 @@ static const MTropolisGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_TESTING,
-			GUIO3(GAMEOPTION_WIDESCREEN_MOD, GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS, GAMEOPTION_SOUND_GAMEPLAY_SUBTITLES)
+			GUIO3(GAMEOPTION_WIDESCREEN_MOD, GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS, GAMEOPTION_SOUND_EFFECT_SUBTITLES)
 		},
 		GID_OBSIDIAN,
 		0,
@@ -75,7 +75,7 @@ static const MTropolisGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_TESTING,
-			GUIO3(GAMEOPTION_WIDESCREEN_MOD, GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS, GAMEOPTION_SOUND_GAMEPLAY_SUBTITLES)
+			GUIO3(GAMEOPTION_WIDESCREEN_MOD, GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS, GAMEOPTION_SOUND_EFFECT_SUBTITLES)
 		},
 		GID_OBSIDIAN,
 		0,
@@ -102,7 +102,7 @@ static const MTropolisGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_TESTING,
-			GUIO3(GAMEOPTION_WIDESCREEN_MOD, GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS, GAMEOPTION_SOUND_GAMEPLAY_SUBTITLES)
+			GUIO3(GAMEOPTION_WIDESCREEN_MOD, GAMEOPTION_AUTO_SAVE_AT_CHECKPOINTS, GAMEOPTION_SOUND_EFFECT_SUBTITLES)
 		},
 		GID_OBSIDIAN,
 		0,