Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Starting from the Favorites menu now starts the software list submenu (if necessary). (#2308)

Browse Source 
* Starting a machine containing a list of the software from the Favorites menu, now determines the launch of the appropriate sub-menu with the list of software.
This commit is contained in:
Dankan1890 2017-05-15 03:37:55 +02:00 committed by Vas Crabb
parent e7b8a8f98e
commit 38e846738d
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,9 @@ favorite_manager::favorite_manager(running_machine &machine, ui_options &moption
void favorite_manager::add_favorite_game(const game_driver *driver)
{
m_list.emplace(driver->type.fullname(), ui_software_info{ driver->name, driver->type.fullname(), "", "", "", 0, "", driver, "", "", "", 1, "", "", "", true });
m_list.emplace(driver->type.fullname(),
ui_software_info{driver->name, driver->type.fullname(), "", "", "", 0, "", driver, "", "", "",
1, "", "", "", true});
save_favorite_games();
}

4
src/frontend/mame/ui/inifile.h
View File

@ -44,8 +44,8 @@ public:
// setters
void move_file(int d) { c_file += d; c_cat = 0; }
void move_cat(int d) { c_cat += d; }
void set_cat(int i) { c_cat = i; }
void set_file(int i) { c_file = i; }
void set_cat(uint16_t i) { c_cat = i; }
void set_file(uint16_t i) { c_file = i; }
private:

14
src/frontend/mame/ui/selgame.cpp
View File

@ -872,6 +872,16 @@ void menu_select_game::inkey_select_favorite(const event *menu_event)
if (summary == media_auditor::CORRECT || summary == media_auditor::BEST_AVAILABLE || summary == media_auditor::NONE_NEEDED)
{
if ((ui_swinfo->driver->flags & MACHINE_TYPE_ARCADE) == 0)
{
for (software_list_device &swlistdev : software_list_device_iterator(enumerator.config()->root_device()))
if (!swlistdev.get_info().empty())
{
menu::stack_push<menu_select_software>(ui(), container(), ui_swinfo->driver);
return;
}
}
// if everything looks good, schedule the new driver
s_bios biosname;
if (!mopt.skip_bios_menu() && has_multiple_bios(ui_swinfo->driver, biosname))
@ -931,7 +941,7 @@ void menu_select_game::inkey_select_favorite(const event *menu_event)
}
std::string error_string;
std::string string_list = std::string(ui_swinfo->listname).append(":").append(ui_swinfo->shortname).append(":").append(ui_swinfo->part).append(":").append(ui_swinfo->instance);
std::string string_list = string_format("%s:%s:%s:%s", ui_swinfo->listname, ui_swinfo->shortname, ui_swinfo->part, ui_swinfo->instance);
mopt.set_value(OPTION_SOFTWARENAME, string_list.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
std::string snap_list = std::string(ui_swinfo->listname).append(PATH_SEPARATOR).append(ui_swinfo->shortname);
mopt.set_value(OPTION_SNAPNAME, snap_list.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
@ -1407,7 +1417,7 @@ bool menu_select_game::load_available_machines()
file.gets(rbuf, MAX_CHAR_INFO);
file.gets(rbuf, MAX_CHAR_INFO);
readbuf = chartrimcarriage(rbuf);
std::string a_rev = std::string(UI_VERSION_TAG).append(bare_build_version);
std::string a_rev = string_format("%s%s", UI_VERSION_TAG, bare_build_version);
// version not matching ? exit
if (a_rev != readbuf)

13
src/frontend/mame/ui/utils.h
View File

@ -156,14 +156,11 @@ struct ui_software_info
bool operator==(const ui_software_info& r)
{
if (shortname == r.shortname && longname == r.longname && parentname == r.parentname
&& year == r.year && publisher == r.publisher && supported == r.supported
&& part == r.part && driver == r.driver && listname == r.listname
&& interface == r.interface && instance == r.instance && startempty == r.startempty
&& parentlongname == r.parentlongname && usage == r.usage && devicetype == r.devicetype)
return true;
return false;
return shortname == r.shortname && longname == r.longname && parentname == r.parentname
&& year == r.year && publisher == r.publisher && supported == r.supported
&& part == r.part && driver == r.driver && listname == r.listname
&& interface == r.interface && instance == r.instance && startempty == r.startempty
&& parentlongname == r.parentlongname && usage == r.usage && devicetype == r.devicetype;
}
};