[Scummvm-git-logs] scummvm master -> 7a9f3944d396fbb25327d553d1636225a50808b4

[OMGPizzaGuy]

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:
7a9f3944d3 ULTIMA8: Remove most engine GUI options that are now handled as dynamic in-game GUI options


Commit: 7a9f3944d396fbb25327d553d1636225a50808b4
    https://github.com/scummvm/scummvm/commit/7a9f3944d396fbb25327d553d1636225a50808b4
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-13T20:27:02-06:00

Commit Message:
ULTIMA8: Remove most engine GUI options that are now handled as dynamic in-game GUI options

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


diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index 78a0ebccb0..a537f97607 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -58,60 +58,6 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 			false
 		}
 	},
-    {
-		GAMEOPTION_FONT_OVERRIDE,
-		{
-			_s("Enable font replacement"),
-			_s("Replaces game fonts with rendered fonts"),
-			"font_override",
-			false
-		}
-	},
-	{
-		GAMEOPTION_FONT_ANTIALIASING,
-		{
-			_s("Enable font anti-aliasing"),
-			_s("When font anti-aliasing is enabled, the text is smoother."),
-			"font_antialiasing",
-			false
-		}
-	},
-	{
-		GAMEOPTION_FOOTSTEPS,
-		{
-			_s("Play foot step sounds"),
-			_s("Plays sound when the player moves."),
-			"footsteps",
-			true
-		}
-	},
-	{
-		GAMEOPTION_TARGETED_JUMP,
-		{
-			_s("Enable jump to mouse position"),
-			_s("Jumping while not moving targets the mouse cursor rather than direction only."),
-			"targetedjump",
-			true
-		}
-	},
-	{
-		GAMEOPTION_FRAMESKIP,
-		{
-			_s("Enable frame skipping"),
-			_s("Allow the game to skip animation frames when running too slow."),
-			"frameSkip",
-			false
-		}
-	},
-	{
-		GAMEOPTION_FRAMELIMIT,
-		{
-			_s("Enable frame limiting"),
-			_s("Limits the speed of the game to prevent running too fast."),
-			"frameLimit",
-			true
-		}
-	},
     AD_EXTRA_GUI_OPTIONS_TERMINATOR
 };
 
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index dab1e76683..21a590dbe9 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -23,14 +23,8 @@
 namespace Ultima {
 
 #define GAMEOPTION_ORIGINAL_SAVELOAD GUIO_GAMEOPTIONS1
-#define GAMEOPTION_FONT_OVERRIDE GUIO_GAMEOPTIONS2
-#define GAMEOPTION_FONT_ANTIALIASING GUIO_GAMEOPTIONS3
-#define GAMEOPTION_FOOTSTEPS GUIO_GAMEOPTIONS4
-#define GAMEOPTION_TARGETED_JUMP GUIO_GAMEOPTIONS5
-#define GAMEOPTION_FRAMESKIP GUIO_GAMEOPTIONS6
-#define GAMEOPTION_FRAMELIMIT GUIO_GAMEOPTIONS7
-
-#define GUI_OPTIONS_ULTIMA8	GUIO8(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING, GAMEOPTION_FOOTSTEPS, GAMEOPTION_TARGETED_JUMP, GAMEOPTION_FRAMESKIP, GAMEOPTION_FRAMELIMIT)
+
+#define GUI_OPTIONS_ULTIMA8	GUIO2(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD)
 
 static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
 #ifndef RELEASE_BUILD