Skip to content

Do Not Iterate Multiple Inputs In Mechlab #1309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LegendaryBlueShirt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do Not Iterate Multiple Inputs In Mechlab #1309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Stop iterating over menu inputs in the same tick
  • Loading branch information
@LegendaryBlueShirt
LegendaryBlueShirt committed Sep 22, 2025
commit da81cb51d6e243b315c8956dadd42f41b74fdfe6
91 changes: 45 additions & 46 deletions src/game/scenes/mechlab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,60 +530,59 @@ void mechlab_input_tick(scene *scene) {
if(i == NULL) {
return;
}
do {
Copy link
Copy Markdown
Member

@Vagabond Vagabond Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could also make this a while() where we check the scene isn't changing?

if(i->type == EVENT_TYPE_ACTION) {
if(local->popup) {
if(i->event_data.action != ACT_STOP) {
text_free(&local->popup);
}
continue;
// i contains a linked list of inputs but in order to prevent a duplicate input crash we only look at the first
// event. If the menu feels unresponsive we could revisit this.
if(i->type == EVENT_TYPE_ACTION) {
if(local->popup) {
if(i->event_data.action != ACT_STOP) {
text_free(&local->popup);
}
// If view is new dashboard view, pass all input to it
else if(local->dashtype == DASHBOARD_NEW_PLAYER) {
// If inputting text for new player name is done, switch to next view.
// If ESC, exit view.
// Otherwise handle text input
if(i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(i->event_data.action == ACT_PUNCH) {
if(strlen(textinput_value(local->nw.input)) > 0) {
strncpy(player1->pilot->name, textinput_value(local->nw.input), 17);
trnmenu_finish(
gui_frame_get_root(local->frame)); // This will trigger exception case in mechlab_tick
}
} else {
log_debug("sending input %d to new player dash", i->event_data.action);
gui_frame_action(local->dashboard, i->event_data.action);
}

} else if(local->dashtype == DASHBOARD_SELECT_NEW_PIC && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(local->dashtype == DASHBOARD_SELECT_DIFFICULTY && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(local->dashtype == DASHBOARD_SELECT_TOURNAMENT && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(local->dashtype == DASHBOARD_SIM && i->event_data.action == ACT_ESC) {
}
// If view is new dashboard view, pass all input to it
else if(local->dashtype == DASHBOARD_NEW_PLAYER) {
// If inputting text for new player name is done, switch to next view.
// If ESC, exit view.
// Otherwise handle text input
if(i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(i->event_data.action == ACT_PUNCH) {
if(strlen(textinput_value(local->nw.input)) > 0) {
strncpy(player1->pilot->name, textinput_value(local->nw.input), 17);
trnmenu_finish(
gui_frame_get_root(local->frame)); // This will trigger exception case in mechlab_tick
}
} else {
gui_frame_action(local->frame, i->event_data.action);
log_debug("sending input %d to new player dash", i->event_data.action);
gui_frame_action(local->dashboard, i->event_data.action);
}

} else if(local->dashtype == DASHBOARD_SELECT_NEW_PIC && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(local->dashtype == DASHBOARD_SELECT_DIFFICULTY && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(local->dashtype == DASHBOARD_SELECT_TOURNAMENT && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else if(local->dashtype == DASHBOARD_SIM && i->event_data.action == ACT_ESC) {
bool found = mechlab_find_last_player(scene);
mechlab_select_dashboard(scene, DASHBOARD_STATS);
gui_frame_set_root(local->frame, lab_menu_main_create(scene, found));
gui_frame_layout(local->frame);
} else {
gui_frame_action(local->frame, i->event_data.action);
}
} while((i = i->next) != NULL);
}
controller_free_chain(p1);
}

Expand Down
Loading