diff options
author | 2010-06-30 03:46:21 +0000 | |
---|---|---|
committer | 2010-06-30 03:46:21 +0000 | |
commit | 733b797a3dae6c89b11c9b3f3eaad68995f6ef09 (patch) | |
tree | 6fa31dcfd68bd9c4a34dd8f2c139d63c00d3e33e /src/emu/config.c | |
parent | 2c549dad23fd5b5e8dc48e5a9c8f7790d17e697d (diff) |
Split mame.c into mame.c and machine.c, the latter containing the
running_machine definition and implementation.
Moved global machine-level operations and accessors into methods on the
running_machine class. For the most part, this doesn't affect drivers
except for a few occasional bits:
mame_get_phase() == machine->phase()
add_reset_callback() == machine->add_notifier(MACHINE_NOTIFY_RESET, ...)
add_exit_callback() == machine->add_notifier(MACHINE_NOTIFY_EXIT, ...)
mame_get_base_datetime() == machine->base_datetime()
mame_get_current_datetime() == machine->current_datetime()
Cleaned up the region_info class, removing most global region accessors
except for memory_region() and memory_region_length(). Again, this doesn't
generally affect drivers.
Diffstat (limited to 'src/emu/config.c')
-rw-r--r-- | src/emu/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/config.c b/src/emu/config.c index e2995c283d9..0d951b6fdbf 100644 --- a/src/emu/config.c +++ b/src/emu/config.c @@ -102,7 +102,7 @@ void config_register(running_machine *machine, const char *nodename, config_call int config_load_settings(running_machine *machine) { - const char *controller = options_get_string(mame_options(), OPTION_CTRLR); + const char *controller = options_get_string(machine->options(), OPTION_CTRLR); file_error filerr; config_type *type; mame_file *file; @@ -137,7 +137,7 @@ int config_load_settings(running_machine *machine) } /* finally, load the game-specific file */ - astring fname(machine->basename, ".cfg"); + astring fname(machine->basename(), ".cfg"); filerr = mame_fopen(SEARCHPATH_CONFIG, fname, OPEN_FLAG_READ, &file); if (filerr == FILERR_NONE) @@ -175,7 +175,7 @@ void config_save_settings(running_machine *machine) } /* finally, save the game-specific file */ - astring fname(machine->basename, ".cfg"); + astring fname(machine->basename(), ".cfg"); filerr = mame_fopen(SEARCHPATH_CONFIG, fname, OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS, &file); if (filerr == FILERR_NONE) |