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

Override and fallback options for artwork (#2908)

Browse Source 
* Added fallback_artwork and override_artwork as MAME options to allow default artwork to be loaded.

* Removed debug testing code.

* - Allow loading of built-in layouts even if override_artwork is specified.
- Allow loading of fallback_artwork if only default view have been found.
- Fixed order of built-in layouts with regards to fallback_artwork as agreed upon the forums.

* Changed |= true to = true, and changed override artwork so it only checks for default.lay if the <machine name>.lay is not found.
This commit is contained in:
phulshof 2018-01-07 05:51:02 +01:00 committed by Vas Crabb
parent e359046b0c
commit 1aaed4a64e
3 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/emuopts.cpp
View File

@ -118,6 +118,8 @@ const options_entry emu_options::s_option_entries[] =
{ OPTION_USE_BEZELS ";bezel", "1", OPTION_BOOLEAN, "enable bezels if artwork is enabled and available" },
{ OPTION_USE_CPANELS ";cpanel", "1", OPTION_BOOLEAN, "enable cpanels if artwork is enabled and available" },
{ OPTION_USE_MARQUEES ";marquee", "1", OPTION_BOOLEAN, "enable marquees if artwork is enabled and available" },
{ OPTION_FALLBACK_ARTWORK, nullptr, OPTION_STRING, "fallback artwork if no external artwork or internal driver layout defined" },
{ OPTION_OVERRIDE_ARTWORK, nullptr, OPTION_STRING, "override artwork for external artwork and internal driver layout" },
// screen options
{ nullptr, nullptr, OPTION_HEADER, "CORE SCREEN OPTIONS" },

4
src/emu/emuopts.h
View File

@ -102,6 +102,8 @@
#define OPTION_USE_BEZELS "use_bezels"
#define OPTION_USE_CPANELS "use_cpanels"
#define OPTION_USE_MARQUEES "use_marquees"
#define OPTION_FALLBACK_ARTWORK "fallback_artwork"
#define OPTION_OVERRIDE_ARTWORK "override_artwork"
// core screen options
#define OPTION_BRIGHTNESS "brightness"
@ -381,6 +383,8 @@ public:
bool use_bezels() const { return bool_value(OPTION_USE_BEZELS); }
bool use_cpanels() const { return bool_value(OPTION_USE_CPANELS); }
bool use_marquees() const { return bool_value(OPTION_USE_MARQUEES); }
const char *fallback_artwork() const { return value(OPTION_FALLBACK_ARTWORK); }
const char *override_artwork() const { return value(OPTION_OVERRIDE_ARTWORK); }
// core screen options
float brightness() const { return float_value(OPTION_BRIGHTNESS); }

88
src/emu/render.cpp
View File

@ -1574,38 +1574,80 @@ void render_target::update_layer_config()
void render_target::load_layout_files(const internal_layout *layoutfile, bool singlefile)
{
bool have_default = false;
bool have_default = false;
bool have_artwork = false;
bool have_override = false;
// if there's an explicit file, load that first
const char *basename = m_manager.machine().basename();
if (layoutfile)
have_default |= load_layout_file(basename, layoutfile);
have_artwork |= load_layout_file(basename, layoutfile);
// if we're only loading this file, we know our final result
if (singlefile)
return;
// try to load a file based on the driver name
const game_driver &system = m_manager.machine().system();
if (!load_layout_file(basename, system.name))
have_default |= load_layout_file(basename, "default");
else
have_default |= true;
// if a default view has been specified, use that as a fallback
if (system.default_layout != nullptr)
have_default |= load_layout_file(nullptr, system.default_layout);
if (m_manager.machine().config().m_default_layout != nullptr)
have_default |= load_layout_file(nullptr, m_manager.machine().config().m_default_layout);
// try to load another file based on the parent driver name
int cloneof = driver_list::clone(system);
if (cloneof != -1) {
if (!load_layout_file(driver_list::driver(cloneof).name, driver_list::driver(cloneof).name))
have_default |= load_layout_file(driver_list::driver(cloneof).name, "default");
else
have_default |= true;
// if override_artwork defined, load that and skip artwork other than default
if (m_manager.machine().options().override_artwork())
{
if (load_layout_file(m_manager.machine().options().override_artwork(), m_manager.machine().options().override_artwork()))
have_override = true;
else if (load_layout_file(m_manager.machine().options().override_artwork(), "default"))
have_override = true;
}
const game_driver &system = m_manager.machine().system();
// Skip if override_artwork has found artwork
if (!have_override)
{
// try to load a file based on the driver name
if (!load_layout_file(basename, system.name))
have_artwork |= load_layout_file(basename, "default");
else
have_artwork = true;
// if a default view has been specified, use that as a fallback
if (system.default_layout != nullptr)
have_default |= load_layout_file(nullptr, system.default_layout);
if (m_manager.machine().config().m_default_layout != nullptr)
have_default |= load_layout_file(nullptr, m_manager.machine().config().m_default_layout);
// try to load another file based on the parent driver name
int cloneof = driver_list::clone(system);
if (cloneof != -1)
{
if (!load_layout_file(driver_list::driver(cloneof).name, driver_list::driver(cloneof).name))
have_artwork |= load_layout_file(driver_list::driver(cloneof).name, "default");
else
have_artwork = true;
}
// Check the parent of the parent to cover bios based artwork
if (cloneof != -1) {
const game_driver &clone(driver_list::driver(cloneof));
int cloneofclone = driver_list::clone(clone);
if (cloneofclone != -1 && cloneofclone != cloneof)
{
if (!load_layout_file(driver_list::driver(cloneofclone).name, driver_list::driver(cloneofclone).name))
have_artwork |= load_layout_file(driver_list::driver(cloneofclone).name, "default");
else
have_artwork = true;
}
}
// Use fallback artwork if defined and no artwork has been found yet
if (!have_artwork && m_manager.machine().options().fallback_artwork())
{
if (!load_layout_file(m_manager.machine().options().fallback_artwork(), m_manager.machine().options().fallback_artwork()))
have_artwork |= load_layout_file(m_manager.machine().options().fallback_artwork(), "default");
else
have_artwork = true;
}
}
screen_device_iterator iter(m_manager.machine().root_device());
unsigned const screens = iter.count();
@ -1620,7 +1662,7 @@ void render_target::load_layout_files(const internal_layout *layoutfile, bool si
throw emu_fatalerror("Couldn't parse default layout??");
}
if (!have_default)
if (!have_default && !have_artwork)
{
if (screens == 0)
{