thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BASE: Initialize default GUI option values before engine instantiation.

Browse source 
This fixes engines (like AGI) which query the configuration options inside
their constructor.
This commit is contained in:
Johannes Schickel 2016-01-17 02:15:03 +01:00
parent f04cadf0a4
commit c321a71241
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
base/main.cpp
View file

@ -152,8 +152,17 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
err = Common::kPathNotDirectory; err = Common::kPathNotDirectory;
// Create the game engine // Create the game engine
if (err.getCode() == Common::kNoError) if (err.getCode() == Common::kNoError) {
// Set default values for all of the custom engine options
// Appareantly some engines query them in their constructor, thus we
// need to set this up before instance creation.
const ExtraGuiOptions engineOptions = (*plugin)->getExtraGuiOptions(Common::String());
for (uint i = 0; i < engineOptions.size(); i++) {
ConfMan.registerDefault(engineOptions[i].configOption, engineOptions[i].defaultState);
}
err = (*plugin)->createInstance(&system, &engine); err = (*plugin)->createInstance(&system, &engine);
}
// Check for errors // Check for errors
if (!engine || err.getCode() != Common::kNoError) { if (!engine || err.getCode() != Common::kNoError) {
@ -231,12 +240,6 @@ static Common::Error runGame(const EnginePlugin *plugin, OSystem &system, const
// Initialize any game-specific keymaps // Initialize any game-specific keymaps
engine->initKeymap(); 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 // Inform backend that the engine is about to be run
system.engineInit(); system.engineInit();