fix steam deck detection

Author: mstop4

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

@@ -1,6 +1,4 @@
 control_manager_functions();
 
 players = ds_list_create();
-num_players = 0;
-
-self.init_steam_deck_info();
+num_players = 0;

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

@@ -4,11 +4,17 @@ draw_text(16, 16, "Control Manager Demo");
 
 draw_text(640, 96, "Gamepads Supported: " + (gamepad_is_supported() ? "Yes" : "No"));
 draw_text(640, 128, "Gamepads Detected: " + string(num_controllers_connected));
-draw_text(640, 192, "Current Slot: " + string(current_gamepad_index + 1) + "/" + string(device_count));
+draw_text(640, 192, "Current Slot: " + string(current_gamepad_index) + "/" + string(device_count - 1));
 draw_text(640, 224, "Gamepad Connected: " + (gamepad_connected[current_gamepad_index] ? "Yes" : "No"));
 draw_text(640, 256, "GUID: " + gamepad_get_guid(current_gamepad_index));
 draw_text(640, 286, "Description: " + gamepad_get_description(current_gamepad_index));
 
+if (os_type == os_linux) {
+	draw_text(640, 320, "Is On Steam Deck: " + (inst_control_manager.is_on_steam_deck() ? "Yes" : "No"));
+	draw_text(640, 352, "Steam Deck Gamepad Index: " + string(inst_control_manager.get_steam_deck_gamepad_index()));
+}
+
+
 for (var i=0; i<num_controls; i++) {
 	var _pressed = my_player.get_control_state(i, CONTROL_STATE.HELD);
 	var _text_colour = _pressed ? c_lime : c_white;

current-scripts/Demos/useful-scripts/objects/obj_init/Alarm_0.gml

@@ -1,4 +1,14 @@
 start_timer = time_source_create(time_source_game, 1, time_source_units_frames, function() {
+	inst_control_manager.init_steam_deck_info();
+	
+	with (obj_persistent_controller) {
+		current_gamepad_index = inst_control_manager.is_on_steam_deck()
+			? inst_control_manager.get_steam_deck_gamepad_index()
+			: 0;
+	
+		my_player.set_gamepad_slot(current_gamepad_index);
+	}
+	time_source_destroy(start_timer);
 	room_goto(room_title);
 });
 

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

@@ -46,10 +46,4 @@ my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.MEN
 my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.MENU_RIGHT, 0, gp_padr);
 my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.MENU_CONFIRM, 0, gp_face1);
 my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.MENU_CANCEL, 0, gp_face2);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.DELETE_BINDING, 0, gp_face3);
-
-current_gamepad_index = inst_control_manager.is_on_steam_deck()
-	? inst_control_manager.get_steam_deck_gamepad_index()
-	: 0;
-	
-my_player.set_gamepad_slot(current_gamepad_index);
+my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.DELETE_BINDING, 0, gp_face3);

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

@@ -87,15 +87,15 @@ function get_os_browser_string(_os_browser) {
 function get_steam_deck_info() {
 	var _result = {
 		is_on_steam_deck: false,
-		gamepad_index: -1,
+		gamepad_index: 0,
 	}
 
-	// Check all gamepad slots for "Valve Streaming Controller"
+	// Check all gamepad slots for "Steam Virtual Gamepad"
 	var _num_devices = gamepad_get_device_count();
   for (var i = 0; i < _num_devices; i++;) {
     if (gamepad_is_connected(i)) {
       var _description = gamepad_get_description(i);
-      if (string_pos("Valve Streaming Gamepad", _description) != 0) {
+      if (string_pos("Steam Virtual Gamepad", _description) != 0) {
         _result.gamepad_index = i;
       }
     }
@@ -113,8 +113,7 @@ function get_steam_deck_info() {
   // Vendor should be "AMD"
   // Version should contain "Mesa"
 	// Renderer should be "AMD Custom GPU 0405"
-  if ( _result.gamepad_index >= 0
-		&& string_pos("AMD", _vendor) != 0
+  if (string_pos("AMD", _vendor) != 0
 		&& string_pos("Mesa", _version) != 0
     && string_pos("AMD Custom GPU 0405", _renderer) != 0) {
     _result.is_on_steam_deck = true;