Skip to content

Commit 38cc9eb

Browse files
committed
main menu uses actual menu component
1 parent ead9749 commit 38cc9eb

File tree

16 files changed

+66
-46
lines changed

16 files changed

+66
-46
lines changed

current-scripts/Demos/useful-scripts/objects/obj_demo_title/Create_0.gml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,10 @@ room_names = [
2323
"Web"
2424
];
2525

26+
menu = instance_create_layer(32, 64, layer, obj_menu);
27+
menu.menu_init(fnt_demo, spr_arrow, "menu_demo_control_handler");
28+
menu.line_spacing = 16;
29+
30+
for (var i=0; i<num_rooms; i++) {
31+
menu.add_menu_selectable(room_names[i], "go_to_demo", [ rooms[i] ]);
32+
}

current-scripts/Demos/useful-scripts/objects/obj_demo_title/Draw_0.gml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@ draw_set_colour(c_white);
22
draw_set_font(fnt_title);
33
draw_set_halign(fa_left);
44
draw_set_valign(fa_top);
5-
draw_text(16, 16, "Useful GML Script Demos");
6-
7-
draw_set_font(fnt_demo);
8-
for (var i=0; i<num_rooms; i++) {
9-
draw_text(16, 48+32*i, string(i+1) + " - " + string(room_names[i]));
10-
}
5+
draw_text(16, 16, "Useful GML Script Demos");

current-scripts/Demos/useful-scripts/objects/obj_demo_title/KeyPress_1.gml

Lines changed: 0 additions & 9 deletions
This file was deleted.

current-scripts/Demos/useful-scripts/objects/obj_demo_title/obj_demo_title.yy

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ if (control_state.pressed_state[MENU_CONTROLS.UP]) {
66

77
if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
88
pos = wrap(pos+1, 0, num_items-1);
9+
}
10+
11+
if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {
12+
script_execute(items[| pos].on_confirm, items[| pos].args);
913
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
menu = instance_create_layer(32, 32, layer, obj_menu);
22
menu.menu_init(fnt_demo, spr_arrow, "menu_demo_control_handler");
33

4-
menu.add_menu_selectable("Foo", -1);
5-
menu.add_menu_selectable("Bar", -1);
6-
menu.add_menu_selectable("Baz", -1);
7-
menu.add_menu_selectable("Qux", -1);
4+
menu.add_menu_selectable("Foo", -1, []);
5+
menu.add_menu_selectable("Bar", -1, []);
6+
menu.add_menu_selectable("Baz", -1, []);
7+
menu.add_menu_selectable("Qux", -1, []);

current-scripts/Demos/useful-scripts/objects/obj_quitter/obj_quitter.yy

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

current-scripts/Demos/useful-scripts/rooms/room_title/room_title.yy

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

current-scripts/Demos/useful-scripts/scripts/input/input.gml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ function keycode_to_string(_keycode) {
1515
return "SHIFT";
1616
case vk_lshift:
1717
return "LEFT SHIFT";
18-
case vk_lcontrol:
19-
return "LEFT CTRL";
20-
case vk_lalt:
21-
return "LEFT ALT";
2218
case vk_rshift:
2319
return "RIGHT SHIFT";
20+
case vk_control:
21+
return "CTRL";
22+
case vk_lcontrol:
23+
return "LEFT CTRL";
2424
case vk_rcontrol:
2525
return "RIGHT CTRL";
26+
case vk_alt:
27+
return "ALT";
28+
case vk_lalt:
29+
return "LEFT ALT";
2630
case vk_ralt:
2731
return "RIGHT ALT";
2832
case vk_pause:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
function go_to_demo(_args) {
2+
room_goto(_args[0]);
3+
}

0 commit comments

Comments
 (0)