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

Updated with latest from trunk

Browse source 
svn-id: r53976
This commit is contained in:
Yotam Barnoy 2010-10-31 11:08:43 +00:00
commit 94c8d0a14d
1324 changed files with 182171 additions and 23610 deletions
Download patch file Download diff file Expand all files Collapse all files

8
base/main.cpp
View file

@ -315,7 +315,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
Common::StringMap settings;
command = Base::parseCommandLine(settings, argc, argv);
// Load the config file (possibly overriden via command line):
// Load the config file (possibly overridden via command line):
if (settings.contains("config")) {
ConfMan.loadConfigFile(settings["config"]);
settings.erase("config");
@ -326,9 +326,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// Update the config file
ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
// Enable translation
TransMan.setLanguage(ConfMan.get("gui_language").c_str());
// Load and setup the debuglevel and the debug flags. We do this at the
// soonest possible moment to ensure debug output starts early on, if
// requested.
@ -440,9 +437,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
PluginManager::instance().loadPlugins();
#endif
} else {
// A dialog would be nicer, but we don't have any
// screen to draw on yet.
warning("%s", _("Could not find any engine capable of running the selected game"));
GUI::displayErrorDialog(_("Could not find any engine capable of running the selected game"));
}