|
|
@ -66,6 +66,7 @@ int wmain(int argc, wchar_t *wargv[]) {
|
|
|
|
("cfg,c", bpo::value<std::string>(), "openmw.cfg file")
|
|
|
|
("cfg,c", bpo::value<std::string>(), "openmw.cfg file")
|
|
|
|
("output,o", bpo::value<std::string>()->default_value(""), "openmw.cfg file")
|
|
|
|
("output,o", bpo::value<std::string>()->default_value(""), "openmw.cfg file")
|
|
|
|
("game-files,g", "import esm and esp files")
|
|
|
|
("game-files,g", "import esm and esp files")
|
|
|
|
|
|
|
|
("fonts,f", "import bitmap fonts")
|
|
|
|
("no-archives,A", "disable bsa archives import")
|
|
|
|
("no-archives,A", "disable bsa archives import")
|
|
|
|
("encoding,e", bpo::value<std::string>()-> default_value("win1252"),
|
|
|
|
("encoding,e", bpo::value<std::string>()-> default_value("win1252"),
|
|
|
|
"Character encoding used in OpenMW game messages:\n"
|
|
|
|
"Character encoding used in OpenMW game messages:\n"
|
|
|
@ -117,6 +118,13 @@ int wmain(int argc, wchar_t *wargv[]) {
|
|
|
|
MwIniImporter::multistrmap ini = importer.loadIniFile(iniFile);
|
|
|
|
MwIniImporter::multistrmap ini = importer.loadIniFile(iniFile);
|
|
|
|
MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);
|
|
|
|
MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!vm.count("fonts"))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ini.erase("Fonts:Font 0");
|
|
|
|
|
|
|
|
ini.erase("Fonts:Font 1");
|
|
|
|
|
|
|
|
ini.erase("Fonts:Font 2");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
importer.merge(cfg, ini);
|
|
|
|
importer.merge(cfg, ini);
|
|
|
|
importer.mergeFallback(cfg, ini);
|
|
|
|
importer.mergeFallback(cfg, ini);
|
|
|
|
|
|
|
|
|
|
|
|