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

BASE: Register debug channels before calling the findGame() in main.cpp

Browse source
This commit is contained in:
ysj1173886760 2021-05-13 16:04:55 +08:00 • committed by Eugene Sandulenko
parent 4505054c33
commit d3b596d820
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/main.cpp
View file

@ -133,7 +133,10 @@ static const Plugin *detectPlugin() {
// Query the plugin for the game descriptor // Query the plugin for the game descriptor
printf(" Looking for a plugin supporting this target... %s\n", plugin->getName()); printf(" Looking for a plugin supporting this target... %s\n", plugin->getName());
PlainGameDescriptor game = plugin->get<MetaEngineDetection>().findGame(gameId.c_str()); const MetaEngineDetection &metaEngine = plugin->get<MetaEngineDetection>();
DebugMan.debugFlagsClear();
DebugMan.debugFlagsRegister(metaEngine.getDebugChannels());
PlainGameDescriptor game = metaEngine.findGame(gameId.c_str());
if (!game.gameId) { if (!game.gameId) {
warning("'%s' is an invalid game ID for the engine '%s'. Use the --list-games option to list supported game IDs", gameId.c_str(), engineId.c_str()); warning("'%s' is an invalid game ID for the engine '%s'. Use the --list-games option to list supported game IDs", gameId.c_str(), engineId.c_str());
return 0; return 0;
@ -229,6 +232,7 @@ static Common::Error runGame(const Plugin *plugin, const Plugin *enginePlugin, O
Common::String caption(ConfMan.get("description")); Common::String caption(ConfMan.get("description"));
if (caption.empty()) { if (caption.empty()) {
// here, we don't need to set the debug channels because it has been set earlier
PlainGameDescriptor game = metaEngineDetection.findGame(ConfMan.get("gameid").c_str()); PlainGameDescriptor game = metaEngineDetection.findGame(ConfMan.get("gameid").c_str());
if (game.description) { if (game.description) {
caption = game.description; caption = game.description;