Merge branch 'dev_4.2_LTS'

JujuAdams · JujuAdams · commit 2c617b329ee2 · 2022-05-22T10:14:58.000+01:00
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/scripts/__input_class_player/__input_class_player.gml b/scripts/__input_class_player/__input_class_player.gml
@@ -115,12 +115,13 @@ function __input_class_player() constructor
             repeat(array_length(_verb_names))
             {
                 var _verb_name = _verb_names[_v];
+                var _verb      = verbs[$ _verb_name];
                 
-                if ((force_value != undefined) && (force_analogue != undefined))
+                if ((_verb.force_value != undefined) && (_verb.force_analogue != undefined))
                 {
                     //We've had our value set this frame via input_verb_set()
                     
-                    with(verbs[$ _verb_name])
+                    with(_verb)
                     {
                         value = force_value;
                         raw   = force_value;
@@ -254,7 +255,7 @@ function __input_class_player() constructor
                         ++_a;
                     }
                 
-                    with(verbs[$ _verb_name])
+                    with(_verb)
                     {
                         value = _value;
                         raw   = _raw;
diff --git a/scripts/__input_class_verb/__input_class_verb.gml b/scripts/__input_class_verb/__input_class_verb.gml
@@ -16,6 +16,7 @@ function __input_class_verb() constructor
     min_threshold  = undefined;
     max_threshold  = undefined;
     force_value    = undefined;
+    force_analogue = undefined;
     
     previous_held = false;
     press         = false;
diff --git a/scripts/__input_initialize/__input_initialize.gml b/scripts/__input_initialize/__input_initialize.gml
@@ -479,7 +479,7 @@ function __input_initialize()
                 if (_steam_switch)  array_push(_ignore_list, "switch");
                 if (_steam_ps)      array_push(_ignore_list, "ps4", "ps5");
                 if (_steam_xbox)    array_push(_ignore_list, "xbox 360", "xbox one");        
-                if (_steam_generic) array_push(_ignore_list, "snes", "saturn", "n64", "gamecube", "psx", "xbox" "switch joycon left", "switch joycon right", "unknown");
+                if (_steam_generic) array_push(_ignore_list, "snes", "saturn", "n64", "gamecube", "psx", "xbox", "switch joycon left", "switch joycon right", "unknown");
              
                 var _i = 0;
                 repeat(array_length(_ignore_list))
diff --git a/scripts/__input_system/__input_system.gml b/scripts/__input_system/__input_system.gml
@@ -1,5 +1,5 @@
-#macro __INPUT_VERSION "4.2.0"
-#macro __INPUT_DATE    "2022-04-22"
+#macro __INPUT_VERSION "4.2.0.2"
+#macro __INPUT_DATE    "2022-05-22"
 #macro __INPUT_DEBUG   false
 
 
diff --git a/scripts/input_tick/input_tick.gml b/scripts/input_tick/input_tick.gml
@@ -411,7 +411,7 @@ function input_tick()
     }
     
     var _g = 0;
-    repeat(INPUT_MAX_PLAYERS)
+    repeat(gamepad_get_device_count())
     {
         var _old_status = _status_array[_g];
         

Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,13 @@ function __input_class_player() constructor`
`115`	`115`	`repeat(array_length(_verb_names))`
`116`	`116`	`{`
`117`	`117`	`var _verb_name = _verb_names[_v];`
	`118`	`+ var _verb = verbs[$ _verb_name];`
`118`	`119`
`119`		`- if ((force_value != undefined) && (force_analogue != undefined))`
	`120`	`+ if ((_verb.force_value != undefined) && (_verb.force_analogue != undefined))`
`120`	`121`	`{`
`121`	`122`	`//We've had our value set this frame via input_verb_set()`
`122`	`123`
`123`		`- with(verbs[$ _verb_name])`
	`124`	`+ with(_verb)`
`124`	`125`	`{`
`125`	`126`	`value = force_value;`
`126`	`127`	`raw = force_value;`
`@@ -254,7 +255,7 @@ function __input_class_player() constructor`
`254`	`255`	`++_a;`
`255`	`256`	`}`
`256`	`257`
`257`		`- with(verbs[$ _verb_name])`
	`258`	`+ with(_verb)`
`258`	`259`	`{`
`259`	`260`	`value = _value;`
`260`	`261`	`raw = _raw;`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ function input_tick()`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`var _g = 0;`
`414`		`- repeat(INPUT_MAX_PLAYERS)`
	`414`	`+ repeat(gamepad_get_device_count())`
`415`	`415`	`{`
`416`	`416`	`var _old_status = _status_array[_g];`
`417`	`417`