summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/devimage.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-04-18 20:06:43 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-04-18 20:06:43 +0000
commitfecfc465df47655554aeb0ea33eccb0f33d498a7 (patch)
tree842317d1595fa823a6bd290b7667a66d2fc09a81 /src/emu/devimage.c
parent4e7f194a638d0955374d2acf984017d5b1ed0e65 (diff)
Switch from m_machine to machine() everywhere. In some cases this
meant adding a machine() accessor but it's worth it for consistency. This will allow future changes from reference to pointer to happen transparently for devices. [Aaron Giles] Simple S&R: m_machine( *[^ (!=;]) machine()\1
Diffstat (limited to 'src/emu/devimage.c')
-rw-r--r--src/emu/devimage.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/emu/devimage.c b/src/emu/devimage.c
index dd06c5397c8..d4c53c11e3a 100644
--- a/src/emu/devimage.c
+++ b/src/emu/devimage.c
@@ -320,7 +320,7 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent
// " swlist % clonename % parentname "
// below, we have the code to split the elements and to create paths to load from
- software_list *software_list_ptr = software_list_open(m_machine.options(), swlist, FALSE, NULL);
+ software_list *software_list_ptr = software_list_open(machine().options(), swlist, FALSE, NULL);
if (software_list_ptr)
{
for (software_info *swinfo = software_list_find(software_list_ptr, swname, NULL); swinfo != NULL; )
@@ -332,7 +332,7 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent
locationtag.cat(breakstr);
//printf("%s\n", locationtag.cstr());
}
- const char *parentname = software_get_clone(m_machine.options(), swlist, swinfo->shortname);
+ const char *parentname = software_get_clone(machine().options(), swlist, swinfo->shortname);
if (parentname != NULL)
swinfo = software_list_find(software_list_ptr, parentname, NULL);
else
@@ -343,10 +343,10 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent
software_list_close(software_list_ptr);
}
- if (software_get_support(m_machine.options(), swlist, swname) == SOFTWARE_SUPPORTED_PARTIAL)
+ if (software_get_support(machine().options(), swlist, swname) == SOFTWARE_SUPPORTED_PARTIAL)
mame_printf_error("WARNING: support for software %s (in list %s) is only partial\n", swname, swlist);
- if (software_get_support(m_machine.options(), swlist, swname) == SOFTWARE_SUPPORTED_NO)
+ if (software_get_support(machine().options(), swlist, swname) == SOFTWARE_SUPPORTED_NO)
mame_printf_error("WARNING: support for software %s (in list %s) is only preliminary\n", swname, swlist);
// check if locationtag actually contains two locations separated by '%'
@@ -376,16 +376,16 @@ bool legacy_image_device_base::load_software(char *swlist, char *swname, rom_ent
// - if we are using lists, we have: list/clonename, list/parentname, clonename, parentname
// try to load from list/setname
if ((m_mame_file == NULL) && (tag2.cstr() != NULL))
- filerr = common_process_file(m_machine.options(), tag2.cstr(), has_crc, crc, romp, &m_mame_file);
+ filerr = common_process_file(machine().options(), tag2.cstr(), has_crc, crc, romp, &m_mame_file);
// try to load from list/parentname
if ((m_mame_file == NULL) && (tag3.cstr() != NULL))
- filerr = common_process_file(m_machine.options(), tag3.cstr(), has_crc, crc, romp, &m_mame_file);
+ filerr = common_process_file(machine().options(), tag3.cstr(), has_crc, crc, romp, &m_mame_file);
// try to load from setname
if ((m_mame_file == NULL) && (tag4.cstr() != NULL))
- filerr = common_process_file(m_machine.options(), tag4.cstr(), has_crc, crc, romp, &m_mame_file);
+ filerr = common_process_file(machine().options(), tag4.cstr(), has_crc, crc, romp, &m_mame_file);
// try to load from parentname
if ((m_mame_file == NULL) && (tag5.cstr() != NULL))
- filerr = common_process_file(m_machine.options(), tag5.cstr(), has_crc, crc, romp, &m_mame_file);
+ filerr = common_process_file(machine().options(), tag5.cstr(), has_crc, crc, romp, &m_mame_file);
if (filerr == FILERR_NONE)
{
@@ -489,7 +489,7 @@ done:
if (m_err!=0) {
if (!m_init_phase)
{
- if (m_machine.phase() == MACHINE_PHASE_RUNNING)
+ if (machine().phase() == MACHINE_PHASE_RUNNING)
popmessage("Error: Unable to %s image '%s': %s\n", is_create ? "create" : "load", path, error());
else
mame_printf_error("Error: Unable to %s image '%s': %s", is_create ? "create" : "load", path, error());
@@ -504,7 +504,7 @@ done:
{
if (!m_init_phase)
{
- if (m_machine.phase() == MACHINE_PHASE_RUNNING)
+ if (machine().phase() == MACHINE_PHASE_RUNNING)
popmessage("Image '%s' was successfully %s.", path, is_create ? "created" : "loaded");
else
mame_printf_info("Image '%s' was successfully %s.\n", path, is_create ? "created" : "loaded");