Merge remote branch 'upstream/master' into pegasus

1 files changed, 7 insertions, 1 deletions

diff --git a/base/main.cpp b/base/main.cpp
index 391d911ae8..c657488758 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -195,7 +195,7 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
 	}
 
 	// On creation the engine should have set up all debug levels so we can use
-	// the command line arugments here
+	// the command line arguments here
 	Common::StringTokenizer tokenizer(edebuglevels, " ,");
 	while (!tokenizer.empty()) {
 		Common::String token = tokenizer.nextToken();
@@ -206,6 +206,12 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
 	// Initialize any game-specific keymaps
 	engine->initKeymap();
 
+	// Set default values for all of the custom engine options
+	const ExtraGuiOptions engineOptions = (*plugin)->getExtraGuiOptions(Common::String());
+	for (uint i = 0; i < engineOptions.size(); i++) {
+		ConfMan.registerDefault(engineOptions[i].configOption, engineOptions[i].defaultState);
+	}
+
 	// Inform backend that the engine is about to be run
 	system.engineInit();