[Scummvm-git-logs] scummvm master -> 0848034bf09e1147a28c69cefbe893dcf1f96510
ccawley2011
noreply at scummvm.org
Thu Nov 3 23:01:19 UTC 2022
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:
0848034bf0 DREAMWEB: Clean up the game options
Commit: 0848034bf09e1147a28c69cefbe893dcf1f96510
https://github.com/scummvm/scummvm/commit/0848034bf09e1147a28c69cefbe893dcf1f96510
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-11-03T23:01:08Z
Commit Message:
DREAMWEB: Clean up the game options
Changed paths:
engines/dreamweb/detection.cpp
engines/dreamweb/detection.h
engines/dreamweb/detection_tables.h
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 58665baf94f..11bf01b0438 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -31,9 +31,6 @@
#include "dreamweb/detection.h"
#include "dreamweb/dreamweb.h"
-#define GAMEOPTION_TTS_THINGS GUIO_GAMEOPTIONS1
-#define GAMEOPTION_TTS_SPEECH GUIO_GAMEOPTIONS2
-
static const PlainGameDescriptor dreamWebGames[] = {
{ "dreamweb", "DreamWeb" },
{ nullptr, nullptr }
@@ -107,7 +104,7 @@ public:
AdvancedMetaEngineDetection(DreamWeb::gameDescriptions,
sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames,
gameGuiOptions) {
- _guiOptions = GUIO1(GUIO_NOMIDI);
+ _guiOptions = GUIO5(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE, GAMEOPTION_TTS_THINGS, GAMEOPTION_TTS_SPEECH);
}
const char *getName() const override {
diff --git a/engines/dreamweb/detection.h b/engines/dreamweb/detection.h
index 799eabc41ce..197192fb7aa 100644
--- a/engines/dreamweb/detection.h
+++ b/engines/dreamweb/detection.h
@@ -28,6 +28,11 @@ struct DreamWebGameDescription {
ADGameDescription desc;
};
+#define GAMEOPTION_ORIGINAL_SAVELOAD GUIO_GAMEOPTIONS1
+#define GAMEOPTION_BRIGHTPALETTE GUIO_GAMEOPTIONS2
+#define GAMEOPTION_TTS_THINGS GUIO_GAMEOPTIONS3
+#define GAMEOPTION_TTS_SPEECH GUIO_GAMEOPTIONS4
+
} // End of namespace DreamWeb
#endif // DREAMWEB_DETECTION_H
diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index d9c4fe82ff2..0221a1a166b 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -26,10 +26,6 @@
namespace DreamWeb {
-#define GAMEOPTION_ORIGINAL_SAVELOAD GUIO_GAMEOPTIONS1
-#define GAMEOPTION_BRIGHTPALETTE GUIO_GAMEOPTIONS2
-
-
static const DreamWebGameDescription gameDescriptions[] = {
// International floppy release
{
@@ -45,7 +41,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
0,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -59,7 +55,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -80,7 +76,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_GRB,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -94,7 +90,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_USA,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -108,7 +104,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -123,7 +119,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -137,7 +133,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformDOS,
0,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -151,7 +147,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -165,7 +161,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::ES_ESP,
Common::kPlatformDOS,
0,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -179,7 +175,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -194,7 +190,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -208,7 +204,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::IT_ITA,
Common::kPlatformDOS,
0,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -226,7 +222,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -245,7 +241,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::CS_CZE,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -263,7 +259,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::RU_RUS,
Common::kPlatformDOS,
ADGF_CD,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -281,7 +277,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -299,7 +295,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD|ADGF_DEMO,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
@@ -317,7 +313,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_DEMO,
- GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ GUIO0()
},
},
More information about the Scummvm-git-logs
mailing list