Skip to content

Commit 56c0f64

Browse files
committed
fix grid menu double SFX bug
1 parent f6def3d commit 56c0f64

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

current-scripts/Demos/useful-scripts/objects/obj_column_menu/Step_1.gml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
if (keyboard_check_pressed(vk_anykey)) {
22
if (active_key_config != noone) {
3-
self.handle_key_config(active_key_config);
3+
self.handle_key_config_change(active_key_config);
44
}
55
}
66

7-
87
if (!enabled) exit;
98

109
control_state.poll_input();
@@ -37,11 +36,11 @@ if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {
3736
var _item = items[| pos];
3837

3938
if (ds_list_find_index(_item.types, "spinner") != -1)
40-
self.handle_spinner_confirm(_item);
39+
self.handle_spinner_confirm(_item);
4140

4241
else if (ds_list_find_index(_item.types, "selectable") != -1)
4342
self.handle_selectable_confirm(_item);
4443

4544
else if (ds_list_find_index(_item.types, "keyconfig") != -1)
46-
self.handle_key_config(_item);
45+
self.handle_key_config_change(_item);
4746
}

current-scripts/Demos/useful-scripts/objects/obj_grid_menu/Step_1.gml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,40 @@ if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
3535

3636
if (control_state.pressed_state[MENU_CONTROLS.LEFT]) {
3737
var _cur_pos = pos.x;
38-
var _item = -1;
38+
var _item = items[# pos.x, pos.y];
39+
40+
if (is_struct(_item)) {
41+
if (ds_list_find_index(_item.types, "spinner") != -1) {
42+
self.handle_spinner_change(_item, -1);
43+
return;
44+
}
45+
}
3946

4047
do {
4148
pos.x = wrap(pos.x-1, 0, ds_grid_width(items)-1);
4249
_item = items[# pos.x, pos.y];
4350
} until (is_struct(_item) || _cur_pos == pos.x)
4451

4552
audio_play_sound(cursor_move_sfx, 1, false);
46-
47-
if (!is_struct(_item)) return;
48-
49-
if (ds_list_find_index(_item.types, "spinner") != -1)
50-
self.handle_spinner_change(_item, -1);
5153
}
5254

5355
if (control_state.pressed_state[MENU_CONTROLS.RIGHT]) {
5456
var _cur_pos = pos.x;
55-
var _item = -1;
57+
var _item = items[# pos.x, pos.y];
58+
59+
if (is_struct(_item)) {
60+
if (ds_list_find_index(_item.types, "spinner") != -1) {
61+
self.handle_spinner_change(_item, 1);
62+
return;
63+
}
64+
}
5665

5766
do {
5867
pos.x = wrap(pos.x+1, 0, ds_grid_width(items)-1);
5968
_item = items[# pos.x, pos.y];
6069
} until (is_struct(_item) || _cur_pos == pos.x)
6170

6271
audio_play_sound(cursor_move_sfx, 1, false);
63-
64-
if (!is_struct(_item)) return;
65-
66-
if (ds_list_find_index(_item.types, "spinner") != -1)
67-
self.handle_spinner_change(_item, 1);
6872
}
6973

7074
if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {

0 commit comments

Comments
 (0)