Skip to content

Commit 774ce95

Browse files
committed
fix menu init
1 parent 4551326 commit 774ce95

File tree

6 files changed

+14
-5
lines changed

6 files changed

+14
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Version: 2.4
1+
Version: 2.4.1

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
enabled = true;
22

3-
draw_set_font(menu_font);
4-
item_height = string_height("Ij");
5-
cursor_width = sprite_get_width(cursor_spr);
6-
73
control_state = new MenuControlState();
84
active_key_config = noone;
95

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// - {sound} cursor_change_sfx
77
// - {sound} cursor_confirm_sfx
88
function column_menu_init(_config) {
9+
self.menu_base_init(_config.font, _config.cursor_spr);
10+
911
menu_font = _config.font;
1012
cursor_spr = _config.cursor_spr;
1113
cursor_padding = sprite_get_width(cursor_spr) + 16;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
// - {sound} cursor_change_sfx
1010
// - {sound} cursor_confirm_sfx
1111
function grid_menu_init(_config) {
12+
self.menu_base_init(_config.font, _config.cursor_spr);
13+
1214
column_width = _config.column_width;
1315
menu_font = _config.font;
1416
cursor_spr = _config.cursor_spr;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/// @func menu_base_init(menu_font, cursor_spr)
2+
/// @param {Font} menu_font
3+
/// @param {Sprite} cursor_spr
4+
function menu_base_init(_menu_font, _cursor_spr) {
5+
draw_set_font(_menu_font);
6+
item_height = string_height("Ij");
7+
cursor_width = sprite_get_width(_cursor_spr);
8+
}
9+
110
/// @func handle_selectable(item)
211
/// @param {MenuSelectable} item
312
function handle_selectable(_item) {
88 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)