Can now skip the cutscene by clicking on it.
This commit is contained in:
parent
8fdaadaf12
commit
d418f073f0
2 changed files with 9 additions and 15 deletions
|
|
@ -214,7 +214,12 @@ namespace gui {
|
||||||
void FSM::BOSS_FIGHT(Event ev, std::any data) {
|
void FSM::BOSS_FIGHT(Event ev, std::any data) {
|
||||||
dbc::check($boss_fight != nullptr, "$boss_fight not initialized");
|
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();
|
$boss_fight->mouse_pos = mouse_position();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,20 +85,9 @@ namespace storyboard {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool UI::mouse(float x, float y, guecs::Modifiers mods) {
|
bool UI::mouse(float, float, guecs::Modifiers) {
|
||||||
auto& cell = $ui.cell_for($zoom_target);
|
$audio->stop();
|
||||||
|
return true;
|
||||||
$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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void UI::zoom(const std::string &cell_name) {
|
void UI::zoom(const std::string &cell_name) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue