[Scummvm-git-logs] scummvm master -> 6bc72b6feeb1f31cf9b25b861b901bbb0c5c05dd
OMGPizzaGuy
48367439+OMGPizzaGuy at users.noreply.github.com
Tue Feb 9 01:21:51 UTC 2021
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b8c8e459c1 ULTIMA8: Move hasFeature check to subengine as others do not support subtitle options
ce5aa86a02 ULTIMA8: Include missing file from previous commit
39f829a0ae ULTIMA8: Add font anti-aliasing GUI option and rename font override for consistency
185b614043 ULTIMA8: Add footsteps GUI option
c846208992 ULTIMA8: Add targettedjump GUI option
6bc72b6fee ULTIMA8: Add frame limit and skipping GUI options
Commit: b8c8e459c16c06b18955838f4c796ce8f9f09fb5
https://github.com/scummvm/scummvm/commit/b8c8e459c16c06b18955838f4c796ce8f9f09fb5
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-08T19:18:32-06:00
Commit Message:
ULTIMA8: Move hasFeature check to subengine as others do not support subtitle options
Changed paths:
engines/ultima/shared/engine/ultima.cpp
engines/ultima/ultima8/ultima8.h
diff --git a/engines/ultima/shared/engine/ultima.cpp b/engines/ultima/shared/engine/ultima.cpp
index e35d2364fe..60fdb729b2 100644
--- a/engines/ultima/shared/engine/ultima.cpp
+++ b/engines/ultima/shared/engine/ultima.cpp
@@ -74,7 +74,6 @@ void UltimaEngine::GUIError(const Common::U32String &msg) {
bool UltimaEngine::hasFeature(EngineFeature f) const {
return
- (f == kSupportsSubtitleOptions) ||
(f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 2cc6201ee7..9660eb3d3f 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -166,12 +166,13 @@ protected:
public:
Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
~Ultima8Engine() override;
- void GUIError(const Common::String &msg);
static Ultima8Engine *get_instance() {
return dynamic_cast<Ultima8Engine *>(_application);
}
+ bool hasFeature(EngineFeature f) const override;
+
bool startup();
void shutdown();
Commit: ce5aa86a020936b5567fc14de49646bafdab8846
https://github.com/scummvm/scummvm/commit/ce5aa86a020936b5567fc14de49646bafdab8846
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-08T19:18:32-06:00
Commit Message:
ULTIMA8: Include missing file from previous commit
Changed paths:
engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 6abc022cf6..2abac836f2 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -167,6 +167,14 @@ bool Ultima8Engine::initialize() {
void Ultima8Engine::deinitialize() {
}
+bool Ultima8Engine::hasFeature(EngineFeature f) const {
+ return
+ (f == kSupportsSubtitleOptions) ||
+ (f == kSupportsReturnToLauncher) ||
+ (f == kSupportsLoadingDuringRuntime) ||
+ (f == kSupportsSavingDuringRuntime);
+}
+
bool Ultima8Engine::startup() {
setDebugger(new Debugger());
pout << "-- Initializing Pentagram -- " << Std::endl;
Commit: 39f829a0ae9bb10f2f9f9be66effb81373196d8c
https://github.com/scummvm/scummvm/commit/39f829a0ae9bb10f2f9f9be66effb81373196d8c
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-08T19:18:32-06:00
Commit Message:
ULTIMA8: Add font anti-aliasing GUI option and rename font override for consistency
Changed paths:
engines/ultima/detection.cpp
engines/ultima/detection_tables.h
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index d3cfa5f860..a437e1a1f8 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -59,11 +59,20 @@ static const ADExtraGuiOptionsMap optionsList[] = {
}
},
{
- GAMEOPTION_OVERRIDE_FONTS,
+ GAMEOPTION_FONT_OVERRIDE,
{
_s("Enable font replacement"),
_s("Replaces game fonts with rendered fonts"),
- "overridefonts",
+ "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
}
},
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 8f293411d6..959a805e4d 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -23,7 +23,10 @@
namespace Ultima {
#define GAMEOPTION_ORIGINAL_SAVELOAD GUIO_GAMEOPTIONS1
-#define GAMEOPTION_OVERRIDE_FONTS GUIO_GAMEOPTIONS2
+#define GAMEOPTION_FONT_OVERRIDE GUIO_GAMEOPTIONS2
+#define GAMEOPTION_FONT_ANTIALIASING GUIO_GAMEOPTIONS3
+
+#define GUI_OPTIONS_ULTIMA8 GUIO4(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING)
static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
#ifndef RELEASE_BUILD
@@ -251,7 +254,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -266,7 +269,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -281,7 +284,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -295,7 +298,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -309,7 +312,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -324,7 +327,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -338,7 +341,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
@@ -352,7 +355,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
Common::JA_JPN,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_OVERRIDE_FONTS)
+ GUI_OPTIONS_ULTIMA8
},
GAME_ULTIMA8,
0
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index c667030a12..0f61e7fcf6 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -398,7 +398,7 @@ void GameData::setupJPOverrides() {
}
}
- bool overridefonts = ConfMan.getBool("overridefonts");
+ bool overridefonts = ConfMan.getBool("font_override");
if (overridefonts)
setupTTFOverrides("language", true);
}
@@ -409,7 +409,7 @@ void GameData::setupTTFOverrides(const char *category, bool SJIS) {
KeyMap ttfkeyvals;
KeyMap::const_iterator iter;
- bool overridefonts = ConfMan.getBool("overridefonts");
+ bool overridefonts = ConfMan.getBool("font_override");
if (!overridefonts) return;
ttfkeyvals = config->listKeyValues(category, "fontoverride");
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 2abac836f2..36f0e05776 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -328,8 +328,8 @@ bool Ultima8Engine::startupGame() {
_game = Game::createGame(getGameInfo());
- ConfMan.registerDefault("overridefonts", false);
- _ttfOverrides = ConfMan.getBool("overridefonts");
+ ConfMan.registerDefault("font_override", false);
+ _ttfOverrides = ConfMan.getBool("font_override");
ConfMan.registerDefault("frameSkip", false);
_frameSkip = ConfMan.getBool("frameSkip");
Commit: 185b61404338974e2ac4f936f47b8073864d00cb
https://github.com/scummvm/scummvm/commit/185b61404338974e2ac4f936f47b8073864d00cb
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-08T19:18:32-06:00
Commit Message:
ULTIMA8: Add footsteps GUI option
Changed paths:
engines/ultima/detection.cpp
engines/ultima/detection_tables.h
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index a437e1a1f8..7f2bcc127c 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -76,6 +76,15 @@ static const ADExtraGuiOptionsMap optionsList[] = {
false
}
},
+ {
+ GAMEOPTION_FOOTSTEPS,
+ {
+ _s("Play foot step sounds"),
+ _s("Plays sound when the player moves."),
+ "footsteps",
+ true
+ }
+ },
AD_EXTRA_GUI_OPTIONS_TERMINATOR
};
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 959a805e4d..00d22f1026 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -25,8 +25,9 @@ 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 GUI_OPTIONS_ULTIMA8 GUIO4(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING)
+#define GUI_OPTIONS_ULTIMA8 GUIO5(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING, GAMEOPTION_FOOTSTEPS)
static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
#ifndef RELEASE_BUILD
Commit: c846208992d44d25d92c7cc2873ec83073929a26
https://github.com/scummvm/scummvm/commit/c846208992d44d25d92c7cc2873ec83073929a26
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-08T19:18:32-06:00
Commit Message:
ULTIMA8: Add targettedjump GUI option
Changed paths:
engines/ultima/detection.cpp
engines/ultima/detection_tables.h
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index 7f2bcc127c..18047fa922 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -85,6 +85,15 @@ static const ADExtraGuiOptionsMap optionsList[] = {
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
+ }
+ },
AD_EXTRA_GUI_OPTIONS_TERMINATOR
};
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 00d22f1026..53c31a4110 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -26,8 +26,9 @@ namespace Ultima {
#define GAMEOPTION_FONT_OVERRIDE GUIO_GAMEOPTIONS2
#define GAMEOPTION_FONT_ANTIALIASING GUIO_GAMEOPTIONS3
#define GAMEOPTION_FOOTSTEPS GUIO_GAMEOPTIONS4
+#define GAMEOPTION_TARGETED_JUMP GUIO_GAMEOPTIONS5
-#define GUI_OPTIONS_ULTIMA8 GUIO5(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING, GAMEOPTION_FOOTSTEPS)
+#define GUI_OPTIONS_ULTIMA8 GUIO6(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING, GAMEOPTION_FOOTSTEPS, GAMEOPTION_TARGETED_JUMP)
static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
#ifndef RELEASE_BUILD
Commit: 6bc72b6feeb1f31cf9b25b861b901bbb0c5c05dd
https://github.com/scummvm/scummvm/commit/6bc72b6feeb1f31cf9b25b861b901bbb0c5c05dd
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-08T19:18:32-06:00
Commit Message:
ULTIMA8: Add frame limit and skipping 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 18047fa922..78a0ebccb0 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -94,6 +94,24 @@ static const ADExtraGuiOptionsMap optionsList[] = {
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 53c31a4110..dab1e76683 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -27,8 +27,10 @@ namespace Ultima {
#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 GUIO6(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FONT_OVERRIDE, GAMEOPTION_FONT_ANTIALIASING, GAMEOPTION_FOOTSTEPS, GAMEOPTION_TARGETED_JUMP)
+#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)
static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
#ifndef RELEASE_BUILD
More information about the Scummvm-git-logs
mailing list