diff options
Diffstat (limited to 'src/emu/render.c')
-rw-r--r-- | src/emu/render.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/emu/render.c b/src/emu/render.c index 94824986872..94f8d0799a4 100644 --- a/src/emu/render.c +++ b/src/emu/render.c @@ -721,9 +721,9 @@ render_container::render_container(render_manager &manager, screen_device *scree { // set the initial orientation and brightness/contrast/gamma m_user.m_orientation = manager.machine().gamedrv->flags & ORIENTATION_MASK; - m_user.m_brightness = options_get_float(&manager.machine().options(), OPTION_BRIGHTNESS); - m_user.m_contrast = options_get_float(&manager.machine().options(), OPTION_CONTRAST); - m_user.m_gamma = options_get_float(&manager.machine().options(), OPTION_GAMMA); + m_user.m_brightness = manager.machine().options().brightness(); + m_user.m_contrast = manager.machine().options().contrast(); + m_user.m_gamma = manager.machine().options().gamma(); } // allocate a client to the main palette @@ -1066,26 +1066,26 @@ render_target::render_target(render_manager &manager, const char *layoutfile, UI m_debug_containers(manager.machine().m_respool) { // determine the base layer configuration based on options - m_base_layerconfig.set_backdrops_enabled(options_get_bool(&manager.machine().options(), OPTION_USE_BACKDROPS)); - m_base_layerconfig.set_overlays_enabled(options_get_bool(&manager.machine().options(), OPTION_USE_OVERLAYS)); - m_base_layerconfig.set_bezels_enabled(options_get_bool(&manager.machine().options(), OPTION_USE_BEZELS)); - m_base_layerconfig.set_zoom_to_screen(options_get_bool(&manager.machine().options(), OPTION_ARTWORK_CROP)); + m_base_layerconfig.set_backdrops_enabled(manager.machine().options().use_backdrops()); + m_base_layerconfig.set_overlays_enabled(manager.machine().options().use_overlays()); + m_base_layerconfig.set_bezels_enabled(manager.machine().options().use_bezels()); + m_base_layerconfig.set_zoom_to_screen(manager.machine().options().artwork_crop()); // determine the base orientation based on options m_orientation = ROT0; - if (!options_get_bool(&manager.machine().options(), OPTION_ROTATE)) + if (!manager.machine().options().rotate()) m_base_orientation = orientation_reverse(manager.machine().gamedrv->flags & ORIENTATION_MASK); // rotate left/right - if (options_get_bool(&manager.machine().options(), OPTION_ROR) || (options_get_bool(&manager.machine().options(), OPTION_AUTOROR) && (manager.machine().gamedrv->flags & ORIENTATION_SWAP_XY))) + if (manager.machine().options().ror() || (manager.machine().options().auto_ror() && (manager.machine().gamedrv->flags & ORIENTATION_SWAP_XY))) m_base_orientation = orientation_add(ROT90, m_base_orientation); - if (options_get_bool(&manager.machine().options(), OPTION_ROL) || (options_get_bool(&manager.machine().options(), OPTION_AUTOROL) && (manager.machine().gamedrv->flags & ORIENTATION_SWAP_XY))) + if (manager.machine().options().rol() || (manager.machine().options().auto_rol() && (manager.machine().gamedrv->flags & ORIENTATION_SWAP_XY))) m_base_orientation = orientation_add(ROT270, m_base_orientation); // flip X/Y - if (options_get_bool(&manager.machine().options(), OPTION_FLIPX)) + if (manager.machine().options().flipx()) m_base_orientation ^= ORIENTATION_FLIP_X; - if (options_get_bool(&manager.machine().options(), OPTION_FLIPY)) + if (manager.machine().options().flipy()) m_base_orientation ^= ORIENTATION_FLIP_Y; // set the orientation and layerconfig equal to the base @@ -1680,7 +1680,7 @@ bool render_target::load_layout_file(const char *dirname, const char *filename) fname.ins(0, PATH_SEPARATOR).ins(0, dirname); // attempt to open the file; bail if we can't - emu_file layoutfile(manager().machine().options(), SEARCHPATH_ARTWORK, OPEN_FLAG_READ); + emu_file layoutfile(manager().machine().options().art_path(), OPEN_FLAG_READ); file_error filerr = layoutfile.open(fname); if (filerr != FILERR_NONE) return false; @@ -2796,19 +2796,19 @@ void render_manager::config_save(int config_type, xml_data_node *parentnode) container->get_user_settings(settings); // output the color controls - if (settings.m_brightness != options_get_float(&m_machine.options(), OPTION_BRIGHTNESS)) + if (settings.m_brightness != m_machine.options().brightness()) { xml_set_attribute_float(screennode, "brightness", settings.m_brightness); changed = true; } - if (settings.m_contrast != options_get_float(&m_machine.options(), OPTION_CONTRAST)) + if (settings.m_contrast != m_machine.options().contrast()) { xml_set_attribute_float(screennode, "contrast", settings.m_contrast); changed = true; } - if (settings.m_gamma != options_get_float(&m_machine.options(), OPTION_GAMMA)) + if (settings.m_gamma != m_machine.options().gamma()) { xml_set_attribute_float(screennode, "gamma", settings.m_gamma); changed = true; |