diff --git a/addons/godot-playfab/JsonSerializable.gd b/addons/godot-playfab/JsonSerializable.gd index 049c549e..41cd6861 100644 --- a/addons/godot-playfab/JsonSerializable.gd +++ b/addons/godot-playfab/JsonSerializable.gd @@ -40,7 +40,7 @@ func to_dict() -> Dictionary: else: var type_name = sub_prop.get_class() # No to_dict method - likely an error! - # If it is a builtin class, however, a special handler needs to be iomplemented here. + # If it is a builtin class, however, a special handler needs to be implemented here. #push_error("If '%s' is not a builtin class, please implement a to_dict() method! If it IS a builtin class, a special handler needs to be implemented in JsonSerializable." % type_name) print_debug("If '%s' is not a builtin class, please implement a to_dict() method! If it IS a builtin class, a special handler needs to be implemented in JsonSerializable." % type_name) dict[name] = type_name diff --git a/addons/godot-playfab/Models/EventContents.gd b/addons/godot-playfab/Models/EventContents.gd index f9fce4db..0cb40a23 100644 --- a/addons/godot-playfab/Models/EventContents.gd +++ b/addons/godot-playfab/Models/EventContents.gd @@ -21,7 +21,7 @@ var OriginalId: String var OriginalTimestamp: String # Arbitrary data associated with the event. `PayloadJSON` is not implemented. -# If you ***need*** to use `PayloadJSON`, please use a verbaitim request instead. +# If you ***need*** to use `PayloadJSON`, please use a verbatim request instead. var Payload: Dictionary diff --git a/addons/godot-playfab/Models/LoginWithEmailAddressRequest.gd b/addons/godot-playfab/Models/LoginWithEmailAddressRequest.gd index cf70119b..e567671e 100644 --- a/addons/godot-playfab/Models/LoginWithEmailAddressRequest.gd +++ b/addons/godot-playfab/Models/LoginWithEmailAddressRequest.gd @@ -17,3 +17,14 @@ var CustomTags: Dictionary #object # Flags for which pieces of info to return for the user. var InfoRequestParameters: GetPlayerCombinedInfoRequestParams + + +func _get_type_for_property(property_name: String) -> String: + match property_name: + "InfoRequestParameters": + return "GetPlayerCombinedInfoRequestParams" + _: + pass + + push_error("Could not find mapping for property: " + property_name) + return super._get_type_for_property(property_name) diff --git a/addons/godot-playfab/PlayFab.gd b/addons/godot-playfab/PlayFab.gd index 53719743..0190ce75 100644 --- a/addons/godot-playfab/PlayFab.gd +++ b/addons/godot-playfab/PlayFab.gd @@ -189,6 +189,6 @@ func _add_auth_headers(additional_headers: Dictionary, auth_type) -> bool: elif auth_type == AUTH_TYPE.ENTITY_TOKEN: additional_headers["X-EntityToken"] = PlayFabManager.client_config.entity_token.EntityToken else: - push_error("auth_type \"" + auth_type + "\" is invalid") + push_error("auth_type \"" + str(auth_type) + "\" is invalid") return true diff --git a/addons/godot-playfab/PlayFabClientConfig/PlayFabClientConfigLoader.gd b/addons/godot-playfab/PlayFabClientConfig/PlayFabClientConfigLoader.gd index e570c5cb..50f3cfd4 100644 --- a/addons/godot-playfab/PlayFabClientConfig/PlayFabClientConfigLoader.gd +++ b/addons/godot-playfab/PlayFabClientConfig/PlayFabClientConfigLoader.gd @@ -8,7 +8,7 @@ class_name PlayFabClientConfigLoader # Will only work in Debug Mode const DEBUG_DO_NOT_ENCRYPT = false # Only works checked debug builds -# Section to write key/value paris to +# Section to write key/value pairs to const SECTION_NAME = "PlayFab" # **Accessibility: protected/virtual** @@ -45,7 +45,7 @@ func _save(password: String): # Loads an encrypted ConfigFile from disk and returns a `PlayFabClientConfig` # with all properties set from values of ConfigFile -# @paramref password: String - Password used for file enxryption +# @paramref password: String - Password used for file encryption func load(password: String) -> PlayFabClientConfig: _config = ConfigFile.new() var new_config = PlayFabClientConfig.new() @@ -61,7 +61,7 @@ func load(password: String) -> PlayFabClientConfig: if err == ERR_FILE_NOT_FOUND: print_debug("No config file found. After login, it will be created at \"%s\"." % _load_path) else: - var error_message = "Config file didn't load. Error code: %f" % err + var error_message = "Config file didn't load. Error code: %d" % err print_debug(error_message) errors.append(error_message) diff --git a/addons/godot-playfab/PlayFabEditor.gd b/addons/godot-playfab/PlayFabEditor.gd index 8221fc2d..31de5cf6 100644 --- a/addons/godot-playfab/PlayFabEditor.gd +++ b/addons/godot-playfab/PlayFabEditor.gd @@ -7,7 +7,7 @@ var main_panel_instance func _init(): - add_custom_project_setting(PlayFabConstants.SETTING_PLAYFAB_TITLE_ID, "", TYPE_STRING, PROPERTY_HINT_PLACEHOLDER_TEXT, "Retieve from PlayFab Game Manager") + add_custom_project_setting(PlayFabConstants.SETTING_PLAYFAB_TITLE_ID, "", TYPE_STRING, PROPERTY_HINT_PLACEHOLDER_TEXT, "Retrieve from PlayFab Game Manager") var process_mode_hint = ",".join([ "Inherit:%d" % Node.PROCESS_MODE_INHERIT, diff --git a/addons/godot-playfab/PlayFabHttp.gd b/addons/godot-playfab/PlayFabHttp.gd index 54ff3587..7ff91402 100644 --- a/addons/godot-playfab/PlayFabHttp.gd +++ b/addons/godot-playfab/PlayFabHttp.gd @@ -93,7 +93,10 @@ func _http_request(request_method: int, body: Dictionary, path: String, callback if callback.is_valid(): callback.call(json_parse_result) else: - push_error("Response calback " + callback.get_method() + " is no longer valid! Make sure, a script is only removed after all requests returned!") + push_error("Response callback " + callback.get_method() + " is no longer valid! Make sure, a script is only removed after all requests returned!") + return + elif response_code >= 500: + emit_signal("server_error", path) return elif response_code >= 400: var apiErrorWrapper = ApiErrorWrapper.new() @@ -101,6 +104,3 @@ func _http_request(request_method: int, body: Dictionary, path: String, callback apiErrorWrapper.set(key, json_parse_result[key]) emit_signal("api_error", apiErrorWrapper) return - if response_code >= 500: - emit_signal("server_error", path) - return