diff options
author | hop311 <hop3114@gmail.com> | 2024-03-03 17:39:08 +0100 |
---|---|---|
committer | hop311 <hop3114@gmail.com> | 2024-03-03 17:39:08 +0100 |
commit | e2077a0d93be8b2dd48f1ee680809420f1f690d7 (patch) | |
tree | bacc8f4094eff5514a94b3852e9cec9c28391669 /game/src/Game/Autoload | |
parent | 9ee1940ac3d15aa4c0a87b84d1c4ab8958184f63 (diff) |
Add types to GDScript for-loop variablesfor-loop-types
Diffstat (limited to 'game/src/Game/Autoload')
-rw-r--r-- | game/src/Game/Autoload/Argument/ArgumentParser.gd | 12 | ||||
-rw-r--r-- | game/src/Game/Autoload/Resolution.gd | 2 | ||||
-rw-r--r-- | game/src/Game/Autoload/SaveManager.gd | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/game/src/Game/Autoload/Argument/ArgumentParser.gd b/game/src/Game/Autoload/Argument/ArgumentParser.gd index 1b68cad..4ce8b64 100644 --- a/game/src/Game/Autoload/Argument/ArgumentParser.gd +++ b/game/src/Game/Autoload/Argument/ArgumentParser.gd @@ -78,7 +78,7 @@ func _set_argument_setting() -> void: var argument_dictionary : Dictionary = {} if ProjectSettings.has_setting(argument_setting_path): argument_dictionary = ProjectSettings.get_setting_with_override(argument_setting_path) - for option in option_array: + for option : ArgumentOption in option_array: argument_dictionary[option.name] = option.default_value _parse_argument_list(argument_dictionary, OS.get_cmdline_args()) @@ -125,7 +125,7 @@ func _parse_value(arg_name : StringName, value_string : String, type : Variant.T TYPE_RECT2I: push_warning("Value type '%s' may not be supported." % type) var data_array := value_string.lstrip("(").rstrip(")").split(",", false) - for index in range(data_array.size()): + for index : int in data_array.size(): data_array[index] = " " + data_array[index].strip_edges() match type: TYPE_VECTOR2: @@ -210,7 +210,7 @@ func _add_argument(dictionary : Dictionary, option : ArgumentOption, argument : func _parse_argument_list(dictionary : Dictionary, arg_list : PackedStringArray, is_game_args : bool = false) -> Dictionary: var current_key : String = "" var current_option : ArgumentOption = null - for arg in arg_list: + for arg : String in arg_list: if current_option != null: if not arg.begins_with("-"): var result : Variant = _parse_value(current_key, arg, current_option.type) @@ -230,7 +230,7 @@ func _parse_argument_list(dictionary : Dictionary, arg_list : PackedStringArray, # Support for Unix shorthand of multiple boolean arguments # eg: "-abc" means a == true, b == true, c == true if arg.length() > 1 and arg[0] != "-" and arg[1] != "=": - for c in arg: + for c : String in arg: if not ((c >= "a" and c <= "z") or (c >= "A" and c <= "Z")): push_warning("Parsing shorthand alias containing '%s', perhaps you meant '--%s'? Skipping argument." % [c, arg]) break @@ -263,7 +263,7 @@ func _parse_argument_list(dictionary : Dictionary, arg_list : PackedStringArray, if key.length() > 2 and key.begins_with("-"): key = key.substr(1) - for o in option_array: + for o : ArgumentOption in option_array: if key == o.name or o.aliases.any(func(v : StringName) -> bool: return key == v): current_option = o break @@ -311,7 +311,7 @@ Options: "usage: %s [options]" % OS.get_executable_path().get_file() ] ) - for option in option_array: + for option : ArgumentOption in option_array: print_rich(" --%s%s%s" % [ (option.name + (",-%s" % (",-".join(option.aliases)) if option.aliases.size() > 0 else "")).rpad(45), ("Type: %s - Default Value: %s" % [option.get_type_string(), option.default_value]).rpad(45), diff --git a/game/src/Game/Autoload/Resolution.gd b/game/src/Game/Autoload/Resolution.gd index 9dddb29..c25c9fd 100644 --- a/game/src/Game/Autoload/Resolution.gd +++ b/game/src/Game/Autoload/Resolution.gd @@ -29,7 +29,7 @@ var _regex : RegEx func _ready() -> void: assert(minimum_resolution.x > 0 and minimum_resolution.y > 0, "Minimum resolution must be positive!") - for resolution_value in _starting_resolutions: + for resolution_value : Vector2i in _starting_resolutions: add_resolution(resolution_value) assert(not _resolutions.is_empty(), "No valid starting resolutions!") diff --git a/game/src/Game/Autoload/SaveManager.gd b/game/src/Game/Autoload/SaveManager.gd index eead63c..688e163 100644 --- a/game/src/Game/Autoload/SaveManager.gd +++ b/game/src/Game/Autoload/SaveManager.gd @@ -16,7 +16,7 @@ func _ready() -> void: DirAccess.make_dir_recursive_absolute(saves_dir_path) var saves_dir := DirAccess.open(saves_dir_path) - for file in saves_dir.get_files(): + for file : String in saves_dir.get_files(): var save := SaveResource.new() save.load_save(saves_dir_path.path_join(file)) add_or_replace_save(save, true) |