Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 01:11:11 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed 'int ignore_warnings' parameter on core_options::parse_ini_file() to be 'bool ignore_unknown_options'

Browse Source
This commit is contained in:
Nathan Woods 2017-05-09 07:57:44 -04:00 committed by Vas Crabb
parent 3f3b6bc4cc
commit 9d4b370354
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/mame/mame.cpp
View File

@ -129,7 +129,7 @@ void mame_machine_manager::start_luaengine()
emu_file file(options().ini_path(), OPEN_FLAG_READ);
if (file.open("plugin.ini") == osd_file::error::NONE)
{
bool result = m_plugins->parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error);
bool result = m_plugins->parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_MAME_INI < OPTION_PRIORITY_DRIVER_INI, error);
if (!result)
osd_printf_error("**Error loading plugin.ini**\n");
}

2
src/frontend/mame/mameopts.cpp
View File

@ -681,7 +681,7 @@ bool mame_options::parse_one_ini(emu_options &options, const char *basename, int
// parse the file
osd_printf_verbose("Parsing %s.ini\n", basename);
std::string error;
bool result = options.parse_ini_file((util::core_file&)file, priority, OPTION_PRIORITY_DRIVER_INI, error);
bool result = options.parse_ini_file((util::core_file&)file, priority, priority < OPTION_PRIORITY_DRIVER_INI, error);
// append errors if requested
if (!error.empty() && error_string)

4
src/frontend/mame/ui/ui.cpp
View File

@ -2233,7 +2233,7 @@ void mame_ui_manager::load_ui_options()
emu_file file(machine().options().ini_path(), OPEN_FLAG_READ);
if (file.open("ui.ini") == osd_file::error::NONE)
{
bool result = options().parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error);
bool result = options().parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_MAME_INI < OPTION_PRIORITY_DRIVER_INI, error);
if (!result)
osd_printf_error("**Error loading ui.ini**\n");
}
@ -2274,7 +2274,7 @@ void mame_ui_manager::save_main_option()
emu_file file(machine().options().ini_path(), OPEN_FLAG_READ);
if (file.open(emulator_info::get_configname(), ".ini") == osd_file::error::NONE)
{
bool result = options.parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_DRIVER_INI, error);
bool result = options.parse_ini_file((util::core_file&)file, OPTION_PRIORITY_MAME_INI, OPTION_PRIORITY_MAME_INI < OPTION_PRIORITY_DRIVER_INI, error);
if (!result)
{
osd_printf_error("**Error loading %s.ini**\n", emulator_info::get_configname());

4
src/lib/util/options.cpp
View File

@ -424,7 +424,7 @@ bool core_options::parse_command_line(std::vector<std::string> &args, int priori
// an INI file
//-------------------------------------------------
bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ignore_priority, std::string &error_string)
bool core_options::parse_ini_file(util::core_file &inifile, int priority, bool ignore_unknown_options, std::string &error_string)
{
// loop over lines in the file
char buffer[4096];
@ -472,7 +472,7 @@ bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ig
auto curentry = m_entrymap.find(optionname);
if (curentry == m_entrymap.end())
{
if (priority >= ignore_priority)
if (!ignore_unknown_options)
error_string.append(string_format("Warning: unknown option in INI: %s\n", optionname));
continue;
}

2
src/lib/util/options.h
View File

@ -146,7 +146,7 @@ public:
// parsing/input
bool parse_command_line(std::vector<std::string> &args, int priority, std::string &error_string);
bool parse_ini_file(util::core_file &inifile, int priority, int ignore_priority, std::string &error_string);
bool parse_ini_file(util::core_file &inifile, int priority, bool ignore_unknown_options, std::string &error_string);
bool pluck_from_command_line(std::vector<std::string> &args, const std::string &name, std::string &result);
// reverting