diff --git a/gui/fsm.cpp b/gui/fsm.cpp index c3a4140..f4f6fcc 100644 --- a/gui/fsm.cpp +++ b/gui/fsm.cpp @@ -214,7 +214,12 @@ namespace gui { void FSM::BOSS_FIGHT(Event ev, std::any data) { dbc::check($boss_fight != nullptr, "$boss_fight not initialized"); - if($boss_scene->playing()) return; + if($boss_scene->playing()) { + if(ev == gui::Event::MOUSE_CLICK) { + $boss_scene->mouse(0,0, 0); + } + return; + } $boss_fight->mouse_pos = mouse_position(); diff --git a/storyboard/ui.cpp b/storyboard/ui.cpp index 94571d6..fa662f6 100644 --- a/storyboard/ui.cpp +++ b/storyboard/ui.cpp @@ -85,20 +85,9 @@ namespace storyboard { } } - bool UI::mouse(float x, float y, guecs::Modifiers mods) { - auto& cell = $ui.cell_for($zoom_target); - - $zoom_target = *$ui.$parser.hit(x, y); - - if($zoom_target == "a") { - reset(); - } else { - $camera.position(cell.mid_x, cell.mid_y); - zoom($zoom_target); - $camera.play(); - } - - return $ui.mouse(x, y, mods); + bool UI::mouse(float, float, guecs::Modifiers) { + $audio->stop(); + return true; } void UI::zoom(const std::string &cell_name) {