diff options
author | 2016-04-04 23:46:44 -0400 | |
---|---|---|
committer | 2016-04-04 23:46:44 -0400 | |
commit | ee12b7d2f74834cb9ca9dd8d6de7ba9d8c1f30e1 (patch) | |
tree | 18feb0ad0b3c6872533c73964440eb7f626a4174 /src/lib/util/options.cpp | |
parent | 1046be89db453886ee98b72c846f6e42e8da3cfa (diff) |
Revert software-installed slot/image options when changing software
- Remove emu.h's stealth include of emuopts.h through mconfig.h; reduce dependency on emuopts.h in other headers and source files.
- MCFG_CPU_FORCE_NO_DRC is now a CPU configuration parameter rather than a global one; it still works to override the -drc option setting.
Diffstat (limited to 'src/lib/util/options.cpp')
-rw-r--r-- | src/lib/util/options.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp index c6aee563a63..f8ef33b0d39 100644 --- a/src/lib/util/options.cpp +++ b/src/lib/util/options.cpp @@ -146,13 +146,13 @@ void core_options::entry::set_flag(UINT32 mask, UINT32 flag) //------------------------------------------------- // revert - revert back to our default if we are -// at or below the given priority +// within the given priority range //------------------------------------------------- -void core_options::entry::revert(int priority) +void core_options::entry::revert(int priority_hi, int priority_lo) { - // if our priority is low enough, revert to the default - if (m_priority <= priority) + // if our priority is within the range, revert to the default + if (m_priority <= priority_hi && m_priority >= priority_lo) { m_data = m_defdata; m_priority = OPTION_PRIORITY_DEFAULT; @@ -465,11 +465,11 @@ bool core_options::parse_ini_file(util::core_file &inifile, int priority, int ig // priority back to their defaults //------------------------------------------------- -void core_options::revert(int priority) +void core_options::revert(int priority_hi, int priority_lo) { // iterate over options and revert to defaults if below the given priority for (entry &curentry : m_entrylist) - curentry.revert(priority); + curentry.revert(priority_hi, priority_lo); } |