[Scummvm-cvs-logs] scummvm master -> 3ae3a497f2b4c5a8b8ad6a6550c54f664cb4c31c

lordhoto lordhoto at gmail.com
Mon Dec 28 00:15:26 CET 2015


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:
796ea1468f CINE: Remove superflous default value registration for extra GUI options.
8c1fc40d3d CINE: Implement extra GUI options using AD's features.
cadb779821 NEVERHOOD: Remove superflous default value registration for extra GUI options.
603eb3bfb6 DREAMWEB: Remove superflous default value registration for extra GUI options.
d2d700e086 SCI: Remove superflous default value registration for extra GUI options.
bc82ff9216 ZVISION: Remove superflous default value registration for extra GUI options.
c1cfcea39a AGI: Remove superflous default value registration for extra GUI options.
3ae3a497f2 TOLTECS: Remove superflous default value registration for extra GUI options.


Commit: 796ea1468f7871892acc84a5aff69fc99a64cca4
    https://github.com/scummvm/scummvm/commit/796ea1468f7871892acc84a5aff69fc99a64cca4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
CINE: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/cine/cine.cpp



diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 0d3f99b..d2f088d 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -52,9 +52,6 @@ CineEngine::CineEngine(OSystem *syst, const CINEGameDescription *gameDesc)
 	// Setup mixer
 	syncSoundSettings();
 
-	// Assign default values to the config manager, in case settings are missing
-	ConfMan.registerDefault("originalsaveload", "false");
-
 	DebugMan.addDebugChannel(kCineDebugScript,    "Script",    "Script debug level");
 	DebugMan.addDebugChannel(kCineDebugPart,      "Part",      "Part debug level");
 	DebugMan.addDebugChannel(kCineDebugSound,     "Sound",     "Sound debug level");


Commit: 8c1fc40d3d358ee7e315aa5de067d0c435105273
    https://github.com/scummvm/scummvm/commit/8c1fc40d3d358ee7e315aa5de067d0c435105273
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
CINE: Implement extra GUI options using AD's features.

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



diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 027ed91..40e79f9 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -63,18 +63,25 @@ static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = {
 
 #include "cine/detection_tables.h"
 
-static const ExtraGuiOption cineExtraGuiOption = {
-	_s("Use original save/load screens"),
-	_s("Use the original save/load screens, instead of the ScummVM ones"),
-	"originalsaveload",
-	false
+static const ADExtraGuiOptionsMap optionsList[] = {
+	{
+		GAMEOPTION_ORIGINAL_SAVELOAD,
+		{
+			_s("Use original save/load screens"),
+			_s("Use the original save/load screens, instead of the ScummVM ones"),
+			"originalsaveload",
+			false
+		}
+	},
+
+	AD_EXTRA_GUI_OPTIONS_TERMINATOR
 };
 
 class CineMetaEngine : public AdvancedMetaEngine {
 public:
-	CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames) {
+	CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) {
 		_singleid = "cine";
-		_guioptions = GUIO1(GUIO_NOSPEECH);
+		_guioptions = GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD);
 	}
 
 	virtual GameDescriptor findGame(const char *gameid) const {
@@ -95,12 +102,6 @@ public:
 	}
 	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
 
-	const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const {
-		ExtraGuiOptions options;
-		options.push_back(cineExtraGuiOption);
-		return options;
-	}
-
 	virtual bool hasFeature(MetaEngineFeature f) const;
 	virtual SaveStateList listSaves(const char *target) const;
 	virtual int getMaximumSaveSlot() const;
diff --git a/engines/cine/detection_tables.h b/engines/cine/detection_tables.h
index 1188deb..ca6a8a9 100644
--- a/engines/cine/detection_tables.h
+++ b/engines/cine/detection_tables.h
@@ -22,6 +22,8 @@
 
 namespace Cine {
 
+#define GAMEOPTION_ORIGINAL_SAVELOAD   GUIO_GAMEOPTIONS1
+
 static const CINEGameDescription gameDescriptions[] = {
 	{
 		{


Commit: cadb7798214d3c039a7361b3e8a0a1edeab66700
    https://github.com/scummvm/scummvm/commit/cadb7798214d3c039a7361b3e8a0a1edeab66700
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
NEVERHOOD: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/neverhood/neverhood.cpp



diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index c0a235c..c6cff86 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -77,10 +77,6 @@ Common::Error NeverhoodEngine::run() {
 	_gameState.sceneNum = 0;
 	_gameState.which = 0;
 
-	// Assign default values to the config manager, in case settings are missing
-	ConfMan.registerDefault("originalsaveload", "false");
-	ConfMan.registerDefault("skiphallofrecordsscenes", "false");
-
 	_staticData = new StaticData();
 	_staticData->load("neverhood.dat");
 	_gameVars = new GameVars();


Commit: 603eb3bfb63596fe83d38bb579c4b9dd6f484a9f
    https://github.com/scummvm/scummvm/commit/603eb3bfb63596fe83d38bb579c4b9dd6f484a9f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
DREAMWEB: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/dreamweb/dreamweb.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 94a2e60..0514c6e 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -407,8 +407,6 @@ Common::Error DreamWebEngine::run() {
 	_console = new DreamWebConsole(this);
 	_sound = new DreamWebSound(this);
 
-	ConfMan.registerDefault("originalsaveload", "false");
-	ConfMan.registerDefault("bright_palette", true);
 	_hasSpeech = Common::File::exists(_speechDirName + "/r01c0000.raw") && !ConfMan.getBool("speech_mute");
 	_brightPalette = ConfMan.getBool("bright_palette");
 	_copyProtection = ConfMan.getBool("copy_protection");


Commit: d2d700e086036f634ef9453298b0f70dce90b206
    https://github.com/scummvm/scummvm/commit/d2d700e086036f634ef9453298b0f70dce90b206
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
SCI: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index eeea998..75f485d 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -194,12 +194,6 @@ SciEngine::~SciEngine() {
 extern void showScummVMDialog(const Common::String &message);
 
 Common::Error SciEngine::run() {
-	// Assign default values to the config manager, in case settings are missing
-	ConfMan.registerDefault("originalsaveload", "false");
-	ConfMan.registerDefault("native_fb01", "false");
-	ConfMan.registerDefault("windows_cursors", "false");	// Windows cursors for KQ6 Windows
-	ConfMan.registerDefault("silver_cursors", "false");	// Silver cursors for SQ4 CD
-
 	_resMan = new ResourceManager();
 	assert(_resMan);
 	_resMan->addAppropriateSources();


Commit: bc82ff92160f2c82fe51c239282cf8146fcc2ed0
    https://github.com/scummvm/scummvm/commit/bc82ff92160f2c82fe51c239282cf8146fcc2ed0
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
ZVISION: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/zvision/zvision.cpp



diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 779fdc4..b0d69c5 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -136,9 +136,6 @@ void ZVision::registerDefaultSettings() {
 				ConfMan.registerDefault(settingsKeys[i].name, settingsKeys[i].defaultBoolValue);
 		}
 	}
-
-	ConfMan.registerDefault("originalsaveload", false);
-	ConfMan.registerDefault("doublefps", false);
 }
 
 void ZVision::loadSettings() {


Commit: c1cfcea39a71fa052e64eb7cc4f1aa681f02cb46
    https://github.com/scummvm/scummvm/commit/c1cfcea39a71fa052e64eb7cc4f1aa681f02cb46
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
AGI: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/agi/agi.cpp



diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 2b5d713..e907d38 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -505,11 +505,6 @@ struct GameSettings {
 };
 
 AgiBase::AgiBase(OSystem *syst, const AGIGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
-	// Assign default values to the config manager, in case settings are missing
-	ConfMan.registerDefault("originalsaveload", "false");
-	ConfMan.registerDefault("altamigapalette", "false");
-	ConfMan.registerDefault("mousesupport", "true");
-
 	_noSaveLoadAllowed = false;
 
 	_rnd = new Common::RandomSource("agi");


Commit: 3ae3a497f2b4c5a8b8ad6a6550c54f664cb4c31c
    https://github.com/scummvm/scummvm/commit/3ae3a497f2b4c5a8b8ad6a6550c54f664cb4c31c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2015-12-28T00:14:11+01:00

Commit Message:
TOLTECS: Remove superflous default value registration for extra GUI options.

Changed paths:
    engines/toltecs/toltecs.cpp



diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index d3b69e7..c91f51b 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -62,9 +62,6 @@ struct GameSettings {
 };
 
 ToltecsEngine::ToltecsEngine(OSystem *syst, const ToltecsGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
-	// Assign default values to the config manager, in case settings are missing
-	ConfMan.registerDefault("originalsaveload", "false");
-
 	_rnd = new Common::RandomSource("toltecs");
 }
 






More information about the Scummvm-git-logs mailing list