From f7c274591a92e794479de73dfbadd18a42691ae6 Mon Sep 17 00:00:00 2001 From: bicarus-dev <202771338+bicarus-dev@users.noreply.github.com> Date: Sun, 6 Apr 2025 19:25:39 -0700 Subject: [PATCH] museca: add Start and 10KEY lights (#296) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Link to GitHub Issue, if one exists Fixes #295 ## Description of change Add missing `Start` and `10KEY` lights output, as see in the test menu. ## Compiling 👍 ## Testing Seems fine in museca test mode. --- src/spice2x/acio/bmpu/bmpu.cpp | 20 ++++++++++++++++++++ src/spice2x/games/museca/io.cpp | 2 ++ src/spice2x/games/museca/io.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/src/spice2x/acio/bmpu/bmpu.cpp b/src/spice2x/acio/bmpu/bmpu.cpp index c3e1f16..e8ccb5f 100644 --- a/src/spice2x/acio/bmpu/bmpu.cpp +++ b/src/spice2x/acio/bmpu/bmpu.cpp @@ -33,6 +33,11 @@ static int __cdecl ac_io_bmpu_control_1p_start_led_off() { if (avs::game::is_model("KDM")) { auto &lights = games::dea::get_lights(); Lights::writeLight(RI_MGR, lights.at(games::dea::Lights::P1Start), 0.f); + + // MUSECA + } else if (avs::game::is_model("PIX")) { + auto &lights = games::museca::get_lights(); + Lights::writeLight(RI_MGR, lights.at(games::museca::Lights::Start), 0.f); } return 1; @@ -44,6 +49,11 @@ static int __cdecl ac_io_bmpu_control_1p_start_led_on() { if (avs::game::is_model("KDM")) { auto &lights = games::dea::get_lights(); Lights::writeLight(RI_MGR, lights.at(games::dea::Lights::P1Start), 1.f); + + // MUSECA + } else if (avs::game::is_model("PIX")) { + auto &lights = games::museca::get_lights(); + Lights::writeLight(RI_MGR, lights.at(games::museca::Lights::Start), 1.f); } return 1; @@ -55,6 +65,11 @@ static int __cdecl ac_io_bmpu_control_2p_start_led_off() { if (avs::game::is_model("KDM")) { auto &lights = games::dea::get_lights(); Lights::writeLight(RI_MGR, lights.at(games::dea::Lights::P2Start), 0.f); + + // MUSECA + } else if (avs::game::is_model("PIX")) { + auto &lights = games::museca::get_lights(); + Lights::writeLight(RI_MGR, lights.at(games::museca::Lights::Keypad), 0.f); } return 1; @@ -66,6 +81,11 @@ static int __cdecl ac_io_bmpu_control_2p_start_led_on() { if (avs::game::is_model("KDM")) { auto &lights = games::dea::get_lights(); Lights::writeLight(RI_MGR, lights.at(games::dea::Lights::P2Start), 1.f); + + // MUSECA + } else if (avs::game::is_model("PIX")) { + auto &lights = games::museca::get_lights(); + Lights::writeLight(RI_MGR, lights.at(games::museca::Lights::Keypad), 1.f); } return 1; diff --git a/src/spice2x/games/museca/io.cpp b/src/spice2x/games/museca/io.cpp index 4729008..a240405 100644 --- a/src/spice2x/games/museca/io.cpp +++ b/src/spice2x/games/museca/io.cpp @@ -71,6 +71,8 @@ std::vector &games::museca::get_lights() { GameAPI::Lights::sortLights( &lights, + "Start", + "Keypad", "Title R", "Title G", "Title B", diff --git a/src/spice2x/games/museca/io.h b/src/spice2x/games/museca/io.h index 0ff9faa..5998982 100644 --- a/src/spice2x/games/museca/io.h +++ b/src/spice2x/games/museca/io.h @@ -46,6 +46,8 @@ namespace games::museca { // all lights in correct order namespace Lights { enum { + Start, + Keypad, TitleR, TitleG, TitleB,