Skip to content

fixed parameters; typo; renamed parameters #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixed parameters; typo; renamed parameters #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions addons/input_helper/InputHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ public static int MouseMotionThreshold
}


public static string GetSimplifiedDeviceName(string rawName)
public static string GetSimplifiedDeviceName(string rawName, bool force_granular_identifier = false)
{
return (string)Instance.Call("get_simplified_device_name", rawName);
return (string)Instance.Call("get_simplified_device_name", rawName, force_granular_identifier);
}


Expand Down Expand Up @@ -130,9 +130,9 @@ public static void SetKeyboardOrJoypadInputForAction(string action, InputEvent i
}


public static InputEvent GetKeyboardOrJoypadInputForAction(string action, InputEvent input, bool swapIfTaken = true)
public static InputEvent GetKeyboardOrJoypadInputForAction(string action)
{
return (InputEvent)Instance.Call("get_keyboard_or_joypad_input_for_action", action, input, swapIfTaken);
return (InputEvent)Instance.Call("get_keyboard_or_joypad_input_for_action", action);
}


Expand Down Expand Up @@ -166,7 +166,7 @@ public static string SerializeInputsForActions(Array<string> actions = null)

public static void DeserializeInputsForAction(string action, string serializedInputs)
{
Instance.Call("desserialize_inputs_for_action", action, serializedInputs);
Instance.Call("deserialize_inputs_for_action", action, serializedInputs);
}

public static void DeserializeInputsForActions(string serializedInputs)
Expand Down
10 changes: 5 additions & 5 deletions addons/input_helper/input_helper.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,9 @@ func serialize_inputs_for_actions(actions: PackedStringArray = []) -> String:


## Deserialize a single action's inputs.
func deserialize_inputs_for_action(action: String, string: String) -> void:
func deserialize_inputs_for_action(action: String, serialized_inputs: String) -> void:
InputMap.action_erase_events(action)
var action_inputs: PackedStringArray = string.split(";")
var action_inputs: PackedStringArray = serialized_inputs.split(";")
for action_input in action_inputs:
var bits: PackedStringArray = action_input.split(":")

Expand Down Expand Up @@ -372,12 +372,12 @@ func deserialize_inputs_for_action(action: String, string: String) -> void:


## Deserialise a list of actions' inputs.
func deserialize_inputs_for_actions(string: String) -> void:
var data: Dictionary = JSON.parse_string(string)
func deserialize_inputs_for_actions(serialized_inputs: String) -> void:
var data: Dictionary = JSON.parse_string(serialized_inputs)

# Use legacy deserialization
if not data.has("version"):
_deprecated_deserialize_inputs_for_actions(string)
_deprecated_deserialize_inputs_for_actions(serialized_inputs)
return

# Version 1
Expand Down