From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/osd/modules/lib/osdobj_common.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'src/osd/modules/lib/osdobj_common.cpp') diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index d3f5f35192e..3cb67e6ded4 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -163,7 +163,7 @@ const options_entry osd_options::s_option_entries[] = }; osd_options::osd_options() - : emu_options() +: emu_options() { add_entries(osd_options::s_option_entries); } @@ -176,20 +176,20 @@ std::list> osd_common_t::s_window_list; //------------------------------------------------- osd_common_t::osd_common_t(osd_options &options) - : osd_output(), m_machine(nullptr) - , m_options(options) - , m_print_verbose(false) - , m_font_module(nullptr) - , m_sound(nullptr) - , m_debugger(nullptr) - , m_midi(nullptr) - , m_keyboard_input(nullptr) - , m_mouse_input(nullptr) - , m_lightgun_input(nullptr) - , m_joystick_input(nullptr) - , m_output(nullptr) - , m_monitor_module(nullptr) - , m_watchdog(nullptr) + : osd_output(), m_machine(nullptr), + m_options(options), + m_print_verbose(false), + m_font_module(nullptr), + m_sound(nullptr), + m_debugger(nullptr), + m_midi(nullptr), + m_keyboard_input(nullptr), + m_mouse_input(nullptr), + m_lightgun_input(nullptr), + m_joystick_input(nullptr), + m_output(nullptr), + m_monitor_module(nullptr), + m_watchdog(nullptr) { osd_output::push(this); } @@ -409,6 +409,7 @@ void osd_common_t::output_callback(osd_output_channel channel, const char *msg, void osd_common_t::init(running_machine &machine) { + // // This function is responsible for initializing the OSD-specific // video and input functionality, and registering that functionality // with the MAME core. @@ -436,6 +437,7 @@ void osd_common_t::init(running_machine &machine) // // Audio initialization may eventually move into here as well, // instead of relying on independent callbacks from each system. + // m_machine = &machine; -- cgit v1.2.3-70-g09d2