[Scummvm-git-logs] scummvm master -> 3636423b29124c5b86fe64ec9004ed91008ce401
bluegr
noreply at scummvm.org
Sun Nov 6 22:27:40 UTC 2022
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a84336c583 COMMON: more flexible gui options handling
ff3a48d7c1 SCUMM: make use of new gui options handling for render modes
eb51135a6f GUI: Only show render mode options explicitly supported by the game
42220e03cc SCUMM: Explicitly declare supported render modes
f0cf83ea65 SCUMM: Add EGA render mode to Day of the Tentacle and Sam & Max
73dd040dba SCUMM: Allow Amiga rendering for v2 games
744b55b42c AGI: make use of new gui options handling for render modes
3636423b29 STARTREK: add appropriate render options to detection tables
Commit: a84336c5838deb890f25fcad732258069fe9cd2c
https://github.com/scummvm/scummvm/commit/a84336c5838deb890f25fcad732258069fe9cd2c
Author: athrxx (athrxx at scummvm.org)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
COMMON: more flexible gui options handling
This allows the meta engines to post process the gui options,
before they get to be used in the GUI. This allows adding or
removing options on a larger scale without having to modify
each detection entry individually. In this case, it is meant to be
used in the SCUMM engine, to allow adding render mode
gui options wothout modifying the tables.
Changed paths:
engines/metaengine.h
gui/options.cpp
diff --git a/engines/metaengine.h b/engines/metaengine.h
index c61fc8460f9..bb3877c59aa 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -26,6 +26,7 @@
#include "common/scummsys.h"
#include "common/error.h"
#include "common/array.h"
+#include "common/gui_options.h"
#include "engines/game.h"
#include "engines/savestate.h"
@@ -180,6 +181,21 @@ public:
return ExtraGuiOptions();
}
+ /**
+ * The default version of this method will just parse the options string from
+ * the config manager. However it also allows the meta engine to post process
+ * result and add/remove other options as needed.
+ *
+ * @param optionsString Options string that from the config manager.
+ * @param domain Domain of the current target.
+ *
+ * @return The fully processed options string that is usable by the GUI.
+ *
+ */
+ virtual Common::String parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const {
+ return parseGameGUIOptions(optionsString);
+ }
+
/**
* Return a list of engine specified debug channels
*
diff --git a/gui/options.cpp b/gui/options.cpp
index ecbb2dbffcc..75aac053a59 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -250,7 +250,15 @@ void OptionsDialog::init() {
_guioptions.clear();
if (ConfMan.hasKey("guioptions", _domain)) {
_guioptionsString = ConfMan.get("guioptions", _domain);
- _guioptions = parseGameGUIOptions(_guioptionsString);
+
+ const Plugin *plugin = nullptr;
+ EngineMan.findTarget(_domain, &plugin);
+ if (plugin) {
+ const MetaEngineDetection &metaEngineDetection = plugin->get<MetaEngineDetection>();
+ _guioptions = metaEngineDetection.parseAndCustomizeGuiOptions(_guioptionsString, _domain);
+ } else {
+ _guioptions = parseGameGUIOptions(_guioptionsString);
+ }
}
}
@@ -259,7 +267,15 @@ void OptionsDialog::build() {
_guioptions.clear();
if (ConfMan.hasKey("guioptions", _domain)) {
_guioptionsString = ConfMan.get("guioptions", _domain);
- _guioptions = parseGameGUIOptions(_guioptionsString);
+
+ const Plugin *plugin = nullptr;
+ EngineMan.findTarget(_domain, &plugin);
+ if (plugin) {
+ const MetaEngineDetection &metaEngineDetection = plugin->get<MetaEngineDetection>();
+ _guioptions = metaEngineDetection.parseAndCustomizeGuiOptions(_guioptionsString, _domain);
+ } else {
+ _guioptions = parseGameGUIOptions(_guioptionsString);
+ }
}
// Control options
Commit: ff3a48d7c1a4509dbad2e60b0712c6236ceacbd3
https://github.com/scummvm/scummvm/commit/ff3a48d7c1a4509dbad2e60b0712c6236ceacbd3
Author: athrxx (athrxx at scummvm.org)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
SCUMM: make use of new gui options handling for render modes
Changed paths:
engines/scumm/detection.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index d8ca1e94621..3ce92238efd 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -84,6 +84,7 @@ public:
PlainGameDescriptor findGame(const char *gameid) const override;
DetectedGames detectGames(const Common::FSList &fslist, uint32 /*skipADFlags*/, bool /*skipIncomplete*/) override;
+ Common::String parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const override;
const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
};
@@ -252,6 +253,53 @@ static const ExtraGuiOption enableOriginalGUI = {
0
};
+Common::String ScummMetaEngineDetection::parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const {
+ Common::String result = MetaEngineDetection::parseAndCustomizeGuiOptions(optionsString, domain);
+ const char *defaultRenderOption = nullptr;
+
+ const Common::Platform platform = Common::parsePlatform(ConfMan.get("platform", domain));
+ const Common::String extra = ConfMan.get("extra", domain);
+
+ // Add default rendermode option for target. We don't put the default mode into the
+ // detection tables, due to the amount of targets we have. It it more convenient to
+ // add the option here.
+ switch (platform) {
+ case Common::kPlatformAmiga:
+ defaultRenderOption = GUIO_RENDERAMIGA;
+ break;
+ case Common::kPlatformApple2GS:
+ defaultRenderOption = GUIO_RENDERAPPLE2GS;
+ break;
+ case Common::kPlatformMacintosh:
+ defaultRenderOption = GUIO_RENDERMACINTOSH;
+ break;
+ case Common::kPlatformFMTowns:
+ defaultRenderOption = GUIO_RENDERFMTOWNS;
+ break;
+ case Common::kPlatformAtariST:
+ defaultRenderOption = GUIO_RENDERATARIST;
+ break;
+ case Common::kPlatformDOS:
+ defaultRenderOption = (extra.equalsIgnoreCase("EGA") || extra.equalsIgnoreCase("V1") || extra.equalsIgnoreCase("V2")) ? GUIO_RENDEREGA : GUIO_RENDERVGA;
+ break;
+ case Common::kPlatformUnknown:
+ // For targets that don't specify the platform (often happens with SCUMM6+ games) we stick with default VGA.
+ defaultRenderOption = GUIO_RENDERVGA;
+ break;
+ default:
+ // Leave this as nullptr for platforms that don't have a specific render option (SegaCD, NES, ...).
+ // These targets will then have the full set of render mode options in the launcher options dialog.
+ break;
+ }
+
+ // If the render option is already part of the string (specified in the
+ // detection tables) we don't add it again.
+ if (defaultRenderOption != nullptr && !result.contains(defaultRenderOption))
+ result += defaultRenderOption;
+
+ return result;
+}
+
const ExtraGuiOptions ScummMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
// Query the GUI options
Commit: eb51135a6fefd7c1f3751d0d1c220bf32e05347b
https://github.com/scummvm/scummvm/commit/eb51135a6fefd7c1f3751d0d1c220bf32e05347b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
GUI: Only show render mode options explicitly supported by the game
The render mode options are confusing, since they're just silently
ignored by games that don't support them. This way, games have to
explicitly declare which render options they support.
Changed paths:
gui/options.cpp
diff --git a/gui/options.cpp b/gui/options.cpp
index 75aac053a59..98272735a1f 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1531,7 +1531,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
const Common::RenderModeDescription *rm = Common::g_renderModes;
for (; rm->code; ++rm) {
Common::String renderGuiOption = Common::renderMode2GUIO(rm->id);
- if ((_domain == Common::ConfigManager::kApplicationDomain) || (_domain != Common::ConfigManager::kApplicationDomain && !renderingTypeDefined) || (_guioptions.contains(renderGuiOption)))
+ if ((_domain == Common::ConfigManager::kApplicationDomain) || (_domain != Common::ConfigManager::kApplicationDomain && renderingTypeDefined && _guioptions.contains(renderGuiOption)))
_renderModePopUp->appendEntry(_c(rm->description, context), rm->id);
}
Commit: 42220e03cc8f2a65dd6e59f48501764f5325c446
https://github.com/scummvm/scummvm/commit/42220e03cc8f2a65dd6e59f48501764f5325c446
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
SCUMM: Explicitly declare supported render modes
Changed paths:
engines/scumm/detection_tables.h
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index aa2f6226dfc..74b4ab6df90 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -156,56 +156,56 @@ static const GameSettings gameVariantsTable[] = {
{"maniac", "Apple II", 0, GID_MANIAC, 0, 0, MDT_APPLEIIGS, 0, Common::kPlatformApple2GS, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
{"maniac", "C64", 0, GID_MANIAC, 0, 0, MDT_C64, 0, Common::kPlatformC64, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) },
{"maniac", "C64 Demo", 0, GID_MANIAC, 0, 0, MDT_C64, GF_DEMO, Common::kPlatformC64, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI) },
- {"maniac", "V1", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, 0, Common::kPlatformDOS, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
- {"maniac", "V1 Demo", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
+ {"maniac", "V1", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, 0, Common::kPlatformDOS, GUIO8(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
+ {"maniac", "V1 Demo", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO7(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA)},
{"maniac", "NES", 0, GID_MANIAC, 1, 0, MDT_NONE, 0, Common::kPlatformNES, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_ENHANCEMENTS)},
- {"maniac", "V2", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
- {"maniac", "V2 Demo", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
+ {"maniac", "V2", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
+ {"maniac", "V2 Demo", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA)},
- {"zak", "V1", "v1", GID_ZAK, 1, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
- {"zak", "V2", "v2", GID_ZAK, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI)},
+ {"zak", "V1", "v1", GID_ZAK, 1, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO7(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA)},
+ {"zak", "V2", "v2", GID_ZAK, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA)},
{"zak", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS)},
{"zakloom", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS)},
{"indyloom", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS)},
{"indyzak", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS)},
- {"indy3", "EGA", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
- {"indy3", "Mac", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR, 0, Common::kPlatformMacintosh, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
- {"indy3", "No AdLib", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
+ {"indy3", "EGA", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, 0, UNK, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
+ {"indy3", "Mac", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR, 0, Common::kPlatformMacintosh, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERMACINTOSHBW, GUIO_ENHANCEMENTS)},
+ {"indy3", "No AdLib", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
{"indy3", "VGA", "vga", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_OLD256 | GF_FEW_LOCALS, Common::kPlatformDOS, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
{"indy3", "Steam", "steam", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_OLD256 | GF_FEW_LOCALS, UNK, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
{"indy3", "FM-TOWNS", 0, GID_INDY3, 3, 0, MDT_TOWNS, GF_OLD256 | GF_FEW_LOCALS | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS)},
- {"loom", "EGA", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO2(GUIO_NOSPEECH, GUIO_ENHANCEMENTS)},
+ {"loom", "EGA", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
{"loom", "No AdLib", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
{"loom", "PC-Engine", 0, GID_LOOM, 3, 0, MDT_NONE, GF_AUDIOTRACKS | GF_OLD256 | GF_16BIT_COLOR, Common::kPlatformPCEngine, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS)},
{"loom", "FM-TOWNS", 0, GID_LOOM, 3, 0, MDT_TOWNS, GF_AUDIOTRACKS | GF_OLD256, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_NOASPECT, GUIO_ENHANCEMENTS)},
- {"loom", "VGA", "vga", GID_LOOM, 4, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformDOS, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"loom", "Steam", "steam", GID_LOOM, 4, 0, MDT_NONE, GF_AUDIOTRACKS, UNK, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"loom", "Demo", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_DEMO, UNK, GUIO1(GUIO_NOSPEECH)},
+ {"loom", "VGA", "vga", GID_LOOM, 4, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformDOS, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"loom", "Steam", "steam", GID_LOOM, 4, 0, MDT_NONE, GF_AUDIOTRACKS, UNK, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"loom", "Demo", "ega", GID_LOOM, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_DEMO, UNK, GUIO2(GUIO_NOSPEECH, GUIO_RENDERCGA)},
- {"pass", 0, 0, GID_PASS, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_16COLOR, Common::kPlatformDOS, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ORIGINALGUI)},
+ {"pass", 0, 0, GID_PASS, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_16COLOR, Common::kPlatformDOS, GUIO4(GUIO_NOSPEECH, GUIO_RENDERCGA, GUIO_NOMIDI, GUIO_ORIGINALGUI)},
- {"monkey", "VGA", "vga", GID_MONKEY_VGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"monkey", "VGA Demo", "vga", GID_MONKEY_VGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_DEMO, UNK, GUIO2(GUIO_NOSPEECH, GUIO_ORIGINALGUI)},
- {"monkey", "EGA", "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_16COLOR, Common::kPlatformDOS, GUIO3(GUIO_NOSPEECH, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"monkey", "VGA", "vga", GID_MONKEY_VGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO4(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"monkey", "VGA Demo", "vga", GID_MONKEY_VGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_DEMO, UNK, GUIO3(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ORIGINALGUI)},
+ {"monkey", "EGA", "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_16COLOR, Common::kPlatformDOS, GUIO6(GUIO_NOSPEECH, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"monkey", "No AdLib", "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR, GF_16COLOR, Common::kPlatformAtariST, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"monkey", "Demo", "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_16COLOR | GF_DEMO, Common::kPlatformDOS, GUIO3(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ORIGINALGUI)},
- {"monkey", "CD", 0, GID_MONKEY, 5, 0, MDT_ADLIB, GF_AUDIOTRACKS, UNK, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"monkey", "Demo", "ega", GID_MONKEY_EGA, 4, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_16COLOR | GF_DEMO, Common::kPlatformDOS, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_ORIGINALGUI)},
+ {"monkey", "CD", 0, GID_MONKEY, 5, 0, MDT_ADLIB, GF_AUDIOTRACKS, UNK, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"monkey", "Mac", 0, GID_MONKEY, 5, 0, MDT_ADLIB, 0, UNK, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"monkey", "FM-TOWNS", 0, GID_MONKEY, 5, 0, MDT_TOWNS, GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"monkey", "SEGA", 0, GID_MONKEY, 5, 0, MDT_NONE, GF_AUDIOTRACKS, Common::kPlatformSegaCD, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"monkey", "SE Talkie", 0, GID_MONKEY, 5, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_AUDIOTRACKS, UNK, GUIO1(GUIO_ORIGINALGUI)},
+ {"monkey", "SE Talkie", 0, GID_MONKEY, 5, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_AUDIOTRACKS, UNK, GUIO2(GUIO_RENDEREGA, GUIO_ORIGINALGUI)},
- {"monkey2", "", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"monkey2", "", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO4(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"monkey2", "Demo", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_DEMO, UNK, GUIO2(GUIO_NOSPEECH, GUIO_ENHANCEMENTS)},
{"monkey2", "Amiga", 0, GID_MONKEY2, 5, 0, MDT_AMIGA, 0, Common::kPlatformAmiga, GUIO4(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"monkey2", "FM-TOWNS", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO7(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"monkey2", "SE Talkie", 0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO1(GUIO_ORIGINALGUI)},
+ {"monkey2", "SE Talkie",0, GID_MONKEY2, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO2(GUIO_RENDEREGA, GUIO_ORIGINALGUI)},
- {"atlantis", "", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO2(GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"atlantis", "Steam", "steam", GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO2(GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"atlantis", "Floppy", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_NOSPEECH, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"atlantis", "", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"atlantis", "Steam", "steam", GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"atlantis", "Floppy", 0, GID_INDY4, 5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO4(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"atlantis", "Amiga", 0, GID_INDY4, 5, 0, MDT_AMIGA, 0, Common::kPlatformAmiga, GUIO4(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"atlantis", "FM-TOWNS", 0, GID_INDY4, 5, 0, MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO6(GUIO_MIDITOWNS, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
Commit: f0cf83ea6546b01d21d1f9e4d889b8dfd087578d
https://github.com/scummvm/scummvm/commit/f0cf83ea6546b01d21d1f9e4d889b8dfd087578d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
SCUMM: Add EGA render mode to Day of the Tentacle and Sam & Max
Changed paths:
engines/scumm/detection_tables.h
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 74b4ab6df90..9e209f39276 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -209,11 +209,11 @@ static const GameSettings gameVariantsTable[] = {
{"atlantis", "Amiga", 0, GID_INDY4, 5, 0, MDT_AMIGA, 0, Common::kPlatformAmiga, GUIO4(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"atlantis", "FM-TOWNS", 0, GID_INDY4, 5, 0, MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO6(GUIO_MIDITOWNS, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"tentacle", "", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO2(GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"tentacle", "Floppy", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO3(GUIO_NOSPEECH, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"tentacle", "", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO3(GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"tentacle", "Floppy", 0, GID_TENTACLE, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO4(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"samnmax", "", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO2(GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
- {"samnmax", "Floppy", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO3(GUIO_NOSPEECH, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"samnmax", "", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO3(GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
+ {"samnmax", "Floppy", 0, GID_SAMNMAX, 6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO4(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
{"ft", "", 0, GID_FT, 7, 0, MDT_NONE, 0, UNK, GUIO2(GUIO_NOMIDI, GUIO_ORIGINALGUI)},
{"ft", "Demo", 0, GID_FT, 7, 0, MDT_NONE, GF_DEMO, UNK, GUIO2(GUIO_NOMIDI, GUIO_ORIGINALGUI)},
Commit: 73dd040dbabe71ffd84ec7568d70805ae8507485
https://github.com/scummvm/scummvm/commit/73dd040dbabe71ffd84ec7568d70805ae8507485
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
SCUMM: Allow Amiga rendering for v2 games
Changed paths:
engines/scumm/detection_tables.h
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 9e209f39276..274368c7019 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -159,11 +159,11 @@ static const GameSettings gameVariantsTable[] = {
{"maniac", "V1", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, 0, Common::kPlatformDOS, GUIO8(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
{"maniac", "V1 Demo", "v1", GID_MANIAC, 1, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO7(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA)},
{"maniac", "NES", 0, GID_MANIAC, 1, 0, MDT_NONE, 0, Common::kPlatformNES, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_ENHANCEMENTS)},
- {"maniac", "V2", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_ENHANCEMENTS)},
- {"maniac", "V2 Demo", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA)},
+ {"maniac", "V2", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO7(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_RENDERAMIGA, GUIO_ENHANCEMENTS)},
+ {"maniac", "V2 Demo", "v2", GID_MANIAC, 2, 0, MDT_PCSPK | MDT_PCJR, GF_DEMO, Common::kPlatformDOS, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_RENDERAMIGA)},
{"zak", "V1", "v1", GID_ZAK, 1, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO7(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGABW, GUIO_RENDERCGACOMP, GUIO_RENDERCGA)},
- {"zak", "V2", "v2", GID_ZAK, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA)},
+ {"zak", "V2", "v2", GID_ZAK, 2, 0, MDT_PCSPK | MDT_PCJR, 0, UNK, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERHERCGREEN, GUIO_RENDERHERCAMBER, GUIO_RENDERCGA, GUIO_RENDERAMIGA)},
{"zak", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS, GUIO_ENHANCEMENTS)},
{"zakloom", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS)},
{"indyloom", "FM-TOWNS", 0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GUIO_TRIM_FMTOWNS_TO_200_PIXELS)},
Commit: 744b55b42c12d2f844589120924f9b0a2bee7480
https://github.com/scummvm/scummvm/commit/744b55b42c12d2f844589120924f9b0a2bee7480
Author: athrxx (athrxx at scummvm.org)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
AGI: make use of new gui options handling for render modes
Changed paths:
engines/agi/detection.cpp
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 0f5a2259790..de079440584 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -20,12 +20,14 @@
*/
+#include "common/config-manager.h"
#include "common/translation.h"
#include "common/system.h"
#include "common/debug.h"
#include "base/plugins.h"
#include "engines/advancedDetector.h"
+#include "engines/metaengine.h"
#include "agi/detection.h"
#include "agi/wagparser.h" // for fallback detection
@@ -185,6 +187,7 @@ public:
}
ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist, ADDetectedGameExtraInfo **extra) const override;
+ Common::String parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const override;
};
ADDetectedGame AgiMetaEngineDetection::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist, ADDetectedGameExtraInfo **extra) const {
@@ -355,4 +358,42 @@ ADDetectedGame AgiMetaEngineDetection::fallbackDetect(const FileMap &allFilesXXX
return ADDetectedGame();
}
+Common::String AgiMetaEngineDetection::parseAndCustomizeGuiOptions(const Common::String &optionsString, const Common::String &domain) const {
+ Common::String result = MetaEngineDetection::parseAndCustomizeGuiOptions(optionsString, domain);
+ Common::String renderOptions;
+
+ const Common::Platform platform = Common::parsePlatform(ConfMan.get("platform", domain));
+ const Common::String gid = ConfMan.get("gameid", domain);
+
+ switch (platform) {
+ case Common::kPlatformDOS:
+ renderOptions = GUIO_RENDEREGA GUIO_RENDERCGA GUIO_RENDERHERCAMBER GUIO_RENDERHERCGREEN;
+ if (gid.contains("AGI256") || gid.contains("256 Colors"))
+ renderOptions += GUIO_RENDERVGA;
+ break;
+ case Common::kPlatformAmiga:
+ renderOptions = GUIO_RENDERAMIGA;
+ break;
+ case Common::kPlatformApple2GS:
+ renderOptions = GUIO_RENDERAPPLE2GS;
+ break;
+ case Common::kPlatformAtariST:
+ renderOptions = GUIO_RENDERATARIST;
+ break;
+ case Common::kPlatformMacintosh:
+ renderOptions = GUIO_RENDERMACINTOSH;
+ break;
+ default:
+ break;
+ }
+
+ for (Common::String::const_iterator i = renderOptions.begin(); i != renderOptions.end(); ++i) {
+ // If the render option is already part of the string (specified in the detection tables) we don't add it again.
+ if (!result.contains(*i))
+ result += *i;
+ }
+
+ return result;
+}
+
REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AgiMetaEngineDetection);
Commit: 3636423b29124c5b86fe64ec9004ed91008ce401
https://github.com/scummvm/scummvm/commit/3636423b29124c5b86fe64ec9004ed91008ce401
Author: athrxx (athrxx at scummvm.org)
Date: 2022-11-07T00:27:34+02:00
Commit Message:
STARTREK: add appropriate render options to detection tables
Changed paths:
engines/startrek/detection.cpp
diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index 8d798fdc219..106fab9ee25 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -56,7 +56,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_CDROM,
@@ -70,7 +70,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_CDROM,
@@ -84,7 +84,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_CD | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_CDROM,
@@ -98,7 +98,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_CD | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_CDROM,
@@ -112,7 +112,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -126,7 +126,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -140,7 +140,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -154,7 +154,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -168,7 +168,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -182,7 +182,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_DEMO,
@@ -196,7 +196,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_DEMO | ADGF_CD | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_DEMO,
@@ -210,7 +210,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_DEMO | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_DEMO,
@@ -228,7 +228,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -242,7 +242,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformAmiga,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -256,7 +256,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformAmiga,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -270,7 +270,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
0,
@@ -284,7 +284,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO | ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_ST25,
GF_DEMO,
@@ -299,7 +299,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_STJR,
GF_CDROM,
@@ -313,7 +313,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_STJR,
GF_CDROM,
@@ -327,7 +327,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_STJR,
0
@@ -341,7 +341,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_UNSTABLE,
- GUIO0()
+ GUIO2(GUIO_RENDERVGA, GUIO_RENDEREGA)
},
GType_STJR,
0
More information about the Scummvm-git-logs
mailing list