From 7cc983601728fa852386f04cb7d85d93421d3dbb Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 8 Nov 2021 11:51:29 +1100 Subject: [PATCH] plugins: Work around menu not remembering selection when ref is nullptr. --- plugins/timer/init.lua | 4 +++- src/mame/drivers/laserbas.cpp | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/timer/init.lua b/plugins/timer/init.lua index d39243da730..e7d7155b4c1 100644 --- a/plugins/timer/init.lua +++ b/plugins/timer/init.lua @@ -17,6 +17,7 @@ function timer.startplugin() local reference = 0 local lastupdate + local highlight -- hacky - workaround for the menu not remembering the selected item if its ref is nullptr local function sectohms(time) @@ -38,7 +39,7 @@ function timer.startplugin() { _p("plugin-timer", "Current time"), sectohms(time), "off" }, { _p("plugin-timer", "Total time"), sectohms(total), "off" }, { _p("plugin-timer", "Play Count"), play_count, "off" } }, - nil, + highlight, "idle" end @@ -47,6 +48,7 @@ function timer.startplugin() reference = reference ~ 1 return true end + highlight = index return os.time() > lastupdate end diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp index 3c2a68780d4..9590a07af8b 100644 --- a/src/mame/drivers/laserbas.cpp +++ b/src/mame/drivers/laserbas.cpp @@ -430,12 +430,8 @@ void laserbas_state::laserbas(machine_config &config) /* sound hardware */ SPEAKER(config, "speaker").front_center(); - DAC_4BIT_R2R(config, m_dac[0], 0).add_route(ALL_OUTPUTS, "speaker", 0.16); - DAC_4BIT_R2R(config, m_dac[1], 0).add_route(ALL_OUTPUTS, "speaker", 0.16); - DAC_4BIT_R2R(config, m_dac[2], 0).add_route(ALL_OUTPUTS, "speaker", 0.16); - DAC_4BIT_R2R(config, m_dac[3], 0).add_route(ALL_OUTPUTS, "speaker", 0.16); - DAC_4BIT_R2R(config, m_dac[4], 0).add_route(ALL_OUTPUTS, "speaker", 0.16); - DAC_4BIT_R2R(config, m_dac[5], 0).add_route(ALL_OUTPUTS, "speaker", 0.16); + for (auto &dac : m_dac) + DAC_4BIT_R2R(config, dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.16); } /*