From 9ece34eb218c5c1960468294c733fd00ac7fa696 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:31:27 -0700 Subject: Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame"" This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791. --- src/emu/softlist_dev.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/emu/softlist_dev.cpp') diff --git a/src/emu/softlist_dev.cpp b/src/emu/softlist_dev.cpp index 8e02afd48ed..d9dc013a26f 100644 --- a/src/emu/softlist_dev.cpp +++ b/src/emu/softlist_dev.cpp @@ -44,7 +44,7 @@ image_software_list_loader image_software_list_loader::s_instance; // false_software_list_loader::load_software //------------------------------------------------- -bool false_software_list_loader::load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const +bool false_software_list_loader::load_software(device_image_interface &image, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const { return false; } @@ -54,9 +54,9 @@ bool false_software_list_loader::load_software(device_image_interface &device, s // rom_software_list_loader::load_software //------------------------------------------------- -bool rom_software_list_loader::load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const +bool rom_software_list_loader::load_software(device_image_interface &image, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const { - swlist.machine().rom_load().load_software_part_region(device, swlist, swname, start_entry); + swlist.machine().rom_load().load_software_part_region(image.device(), swlist, swname, start_entry); return true; } @@ -65,9 +65,9 @@ bool rom_software_list_loader::load_software(device_image_interface &device, sof // image_software_list_loader::load_software //------------------------------------------------- -bool image_software_list_loader::load_software(device_image_interface &device, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const +bool image_software_list_loader::load_software(device_image_interface &image, software_list_device &swlist, const char *swname, const rom_entry *start_entry) const { - return device.load_software(swlist, swname, start_entry); + return image.load_software(swlist, swname, start_entry); } -- cgit v1.2.3-70-g09d2