diff options
author | 2010-06-28 06:40:44 +0000 | |
---|---|---|
committer | 2010-06-28 06:40:44 +0000 | |
commit | 41b9dbb9ace490ee8ab0bd87d35a50e9b693d538 (patch) | |
tree | 945b176affb6ad7958b2016777241736ff6f294d /src/emu/ui.c | |
parent | f9a3aaf5c82bae95ba12b517beaf3fe5d4d1a93a (diff) |
Made the machine_config a proper object. Added detokenize method to
this object which can be called multiple times to append new devices
after the initial machine configuration is set up. Updated member
variables to match new naming convention.
Changed the running_machine to take a constructed machine_config
object in the constructor, instead of creating one itself, for
consistency. Also added machine->total_colors() as a shortcut to
machine->config->m_total_colors.
Diffstat (limited to 'src/emu/ui.c')
-rw-r--r-- | src/emu/ui.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/ui.c b/src/emu/ui.c index d2ba655a1fb..799eb540b89 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -1035,7 +1035,7 @@ astring &game_info_astring(running_machine *machine, astring &string) /* loop over all sound chips */ device_sound_interface *sound = NULL; - for (bool gotone = machine->devicelist.first(sound); gotone; gotone = sound->next(sound)) + for (bool gotone = machine->m_devicelist.first(sound); gotone; gotone = sound->next(sound)) { /* append the Sound: string */ if (!found_sound) @@ -1272,7 +1272,7 @@ void ui_image_handler_ingame(running_machine *machine) /* run display routine for devices */ if (mame_get_phase(machine) == MAME_PHASE_RUNNING) { - for (bool gotone = machine->devicelist.first(image); gotone; gotone = image->next(image)) + for (bool gotone = machine->m_devicelist.first(image); gotone; gotone = image->next(image)) { image->call_display(); } @@ -1695,7 +1695,7 @@ static slider_state *slider_init(running_machine *machine) tailptr = &(*tailptr)->next; } - for (device = machine->devicelist.first(LASERDISC); device != NULL; device = device->typenext()) + for (device = machine->m_devicelist.first(LASERDISC); device != NULL; device = device->typenext()) { const laserdisc_config *config = (const laserdisc_config *)downcast<const legacy_device_config_base &>(device->baseconfig()).inline_config(); if (config->overupdate != NULL) @@ -2149,7 +2149,7 @@ static char *slider_get_screen_desc(screen_device &screen) static char *slider_get_laserdisc_desc(device_t *laserdisc) { - int ldcount = laserdisc->machine->devicelist.count(LASERDISC); + int ldcount = laserdisc->machine->m_devicelist.count(LASERDISC); static char descbuf[256]; if (ldcount > 1) |