V6.0.0

current-scripts/Demos/useful-scripts/notes/info/info.txt

@@ -1 +1 @@
-Version: 5.1.0
+Version: 6.0.0

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

@@ -1,10 +1,11 @@
 if (ds_exists(items, ds_type_list)) {
-	for (var i=0; i<num_items; i++) {
-		items[| i].destroy();
-		delete items[| i];
+	for (var _i=0; _i<num_items; _i++) {
+		items[| _i].destroy();
+		delete items[| _i];
 	}
 
 	ds_list_destroy(items);
 }
 
+// feather ignore once GM1052
 delete control_state;

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

@@ -5,4 +5,5 @@ num_items = 0;
 pos = 0;
 view_area = new Vector2(0, 0);
 
+// Feather disable once GM2039
 column_menu_functions();

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

@@ -8,23 +8,24 @@ if (view_height > 0 && view_scroll_progress_y.v != 0) {
 	_y_offset = (item_height + line_spacing) * -view_scroll_progress_y.v;
 }
 
-for (var i=view_area.x; i<=view_area.y; i++) {
-	_item = items[| i];
+for (var _i=view_area.x; _i<=view_area.y; _i++) {
+	_item = items[| _i];
 
 	if (is_struct(_item)) {
 		if (view_height > 0) {
-			if (view_scroll_progress_y.v < 0 && i == view_area.y) {
+			if (view_scroll_progress_y.v < 0 && _i == view_area.y) {
 				// Scroll up last element
 				draw_set_alpha(1-abs(view_scroll_progress_y.v));
-			} else if (view_scroll_progress_y.v > 0 && i == view_area.x) {
+			} else if (view_scroll_progress_y.v > 0 && _i == view_area.x) {
 				// Scroll down first element
 				draw_set_alpha(1-abs(view_scroll_progress_y.v));
 			} else {
 				draw_set_alpha(menu_alpha.v);
 			}
 		}
-
-		self.menu_base_draw_item(_item, _x, _y + _y_offset);
+
+		var _is_focused = pos == _i;
+		self.menu_base_draw_item(_item, _x, _y + _y_offset, _is_focused);
 	}
 	_y += item_height + line_spacing;
 }
@@ -35,14 +36,18 @@ if (view_height > 0) {
 		_item = items[| view_area.x - 1];
 		if (is_struct(_item)) {
 			draw_set_alpha(abs(view_scroll_progress_y.v));
-			self.menu_base_draw_item(_item, _x, y - (item_height + line_spacing) + _y_offset);
+
+			var _is_focused = pos == view_area.x - 1;
+			self.menu_base_draw_item(_item, _x, y - (item_height + line_spacing) + _y_offset, _is_focused);
 		}
 	} else if (view_scroll_progress_y.v > 0 && view_area.y + 1 < num_items) {
 		// Scroll down last element
 		_item = items[| view_area.y + 1];
 		if (is_struct(_item)) {
 			draw_set_alpha(abs(view_scroll_progress_y.v));
-			self.menu_base_draw_item(_item, _x, _y + _y_offset);
+
+			var _is_focused = pos == view_area.y + 1;
+			self.menu_base_draw_item(_item, _x, _y + _y_offset + _is_focused);
 		}
 	}
 }

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

@@ -17,7 +17,7 @@ if (control_state.pressed_state[MENU_CONTROLS.UP]) {
 			pos = wrap(pos-1, 0, num_items);
 			_item = items[| pos];
 		} until ((is_struct(_item)
-			&& ds_list_find_index(_item.types, "divider") == -1)
+			&& _item.type != "divider")
 			|| _cur_pos == pos)
 
 		var _should_scroll = self.column_menu_update_view() && (pos < _cur_pos);
@@ -35,7 +35,7 @@ if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
 			pos = wrap(pos+1, 0, num_items);
 			_item = items[| pos];
 		} until ((is_struct(_item)
-			&& ds_list_find_index(_item.types, "divider") == -1)
+			&& _item.type != "divider")
 			|| _cur_pos == pos)		
 
 		var _should_scroll = self.column_menu_update_view() && (pos > _cur_pos);
@@ -47,48 +47,51 @@ if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
 if (control_state.pressed_state[MENU_CONTROLS.LEFT]) {
 	var _item = items[| pos];
 
-	if (ds_list_find_index(_item.types, "spinner") != -1)
+	if (_item.type == "spinner")
 		self.handle_spinner_change(_item, -1);
 
-	else if (ds_list_find_index(_item.types, "keyconfig") != -1
+	else if (_item.type == "keyconfig"
 		&& active_key_config == _item)
 		self.handle_key_config_select(_item, -1);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.RIGHT]) {
 	var _item = items[| pos];
 
-	if (ds_list_find_index(_item.types, "spinner") != -1)
+	if (_item.type == "spinner")
 		self.handle_spinner_change(_item, 1);
 
-	else if (ds_list_find_index(_item.types, "keyconfig") != -1
+	else if (_item.type == "keyconfig"
 		&& active_key_config == _item)
 		self.handle_key_config_select(_item, 1);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {
 	var _item = items[| pos];	
 
-	if (ds_list_find_index(_item.types, "spinner") != -1)
+	if (_item.type == "spinner")
 		self.handle_spinner_confirm(_item);
 
-	else if (ds_list_find_index(_item.types, "selectable") != -1)
+	else if (_item.type == "selectable")
 		self.handle_selectable_confirm(_item);
+
+	else if (_item.type == "valuedSelectable")
+		self.handle_valued_selectable_confirm(_item);
 
-	else if (ds_list_find_index(_item.types, "keyconfig") != -1)
+	else if (_item.type == "keyconfig")
 		self.handle_key_config_confirm(_item);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.CANCEL]) {
 	var _item = items[| pos];	
 
-	if (ds_list_find_index(_item.types, "keyconfig") != -1)
+	if (_item.type == "keyconfig")
 		self.handle_key_config_cancel(_item);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.DELETE_BINDING]) {
 	var _item = items[| pos];	
 
-	if (ds_list_find_index(_item.types, "keyconfig") != -1)
+	if (_item.type == "keyconfig")
 		self.handle_key_config_delete(_item);
 }

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

@@ -20,7 +20,7 @@ menu.label_width = 96;
 
 menu.column_menu_add_selectable({ 
 	label: "Item 1",
-	on_confirm_func: "menu_demo_on_confirm",
+	on_confirm_func: menu_demo_on_selectable_confirm,
 	on_confirm_args: ["Foo"],
 	silent_on_confirm: false
 });
@@ -49,21 +49,21 @@ menu.column_menu_add_spinner({
 
 menu.column_menu_add_selectable({ 
 	label: "Item 3",
-	on_confirm_func: "menu_demo_on_confirm",
+	on_confirm_func: menu_demo_on_selectable_confirm,
 	on_confirm_args: ["Baz"],
 	silent_on_confirm: false
 });
 
 menu.column_menu_add_selectable({ 
 	label: "Item 4",
-	on_confirm_func: "menu_demo_on_confirm",
+	on_confirm_func: menu_demo_on_selectable_confirm,
 	on_confirm_args: ["Qux"],
 	silent_on_confirm: false
 });
 
 menu.column_menu_add_selectable({ 
 	label: "Item 5",
-	on_confirm_func: "menu_demo_on_confirm",
+	on_confirm_func: menu_demo_on_selectable_confirm,
 	on_confirm_args: ["Foo"],
 	silent_on_confirm: false
 });
@@ -82,16 +82,20 @@ menu.column_menu_add_spinner({
 
 menu.column_menu_add_selectable({ 
 	label: "Item 7",
-	on_confirm_func: "menu_demo_on_confirm",
+	on_confirm_func: menu_demo_on_selectable_confirm,
 	on_confirm_args: ["Baz"],
 	silent_on_confirm: false
 });
 
-menu.column_menu_add_selectable({ 
+vs_item = menu.column_menu_add_valued_selectable({ 
 	label: "Item 8",
-	on_confirm_func: "menu_demo_on_confirm",
-	on_confirm_args: ["Qux"],
-	silent_on_confirm: false
+	init_value: "Qux",
+	on_confirm_func: menu_demo_on_valued_selectable_confirm,
+	on_confirm_args: ["Qux", "Dux"],
+	on_change_func: menu_demo_on_valued_selectable_change,
+	on_change_args: [],
+	silent_on_confirm: false,
+	silent_on_change: false
 });
 
 menu.view_scroll_arrows_margin = 24;

current-scripts/Demos/useful-scripts/objects/obj_control_manager/CleanUp_0.gml

@@ -1,5 +1,5 @@
-for (var i=0; i<num_players; i++) {
-	delete players[| i];
+for (var _i=0; _i<num_players; _i++) {
+	delete players[| _i];
 }
 
 ds_list_destroy(players);

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

@@ -1,4 +1,12 @@
+// Feather disable once GM2039
 control_manager_functions();
 
 players = ds_list_create();
-num_players = 0;
+num_players = 0;
+device_count = gamepad_get_device_count();
+gamepad_connected = array_create(device_count, false);
+num_gamepads_connected = 0;
+gamepad_discovery_mode = false;
+gamepad_discovery_player_index = 0;
+gamepad_on_discovered_func = pointer_null;
+gamepad_on_discovered_params = [];

current-scripts/Demos/useful-scripts/objects/obj_control_manager_demo/Other_75.gml → current-scripts/Demos/useful-scripts/objects/obj_control_manager/Other_75.gml

@@ -1,7 +1,7 @@
 if (async_load[? "event_type"] == "gamepad discovered") {
-	num_controllers_connected++;
+	num_gamepads_connected++;
 	gamepad_connected[async_load[? "pad_index"]] = true;
 } else if (async_load[? "event_type"] == "gamepad lost") {
-	num_controllers_connected--;	
+	num_gamepads_connected--;	
 	gamepad_connected[async_load[? "pad_index"]] = false;
 }

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

@@ -1,3 +1,7 @@
-for (var i=0; i<num_players; i++) {
-	players[| i].process_input();
+for (var _i=0; _i<num_players; _i++) {
+	players[| _i].process_input();
 }
+
+if (gamepad_discovery_mode) {
+	self.listen_for_gamepad_input();
+}