diff --git a/export_presets.cfg b/export_presets.cfg index 920dad68..2088e7f6 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -38,7 +38,7 @@ architectures/armeabi-v7a=false architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false -version/code=70 +version/code=71 version/name="" package/unique_name="org.godotengine.kalulu" package/name="Kalulu" diff --git a/sources/menus/login/login.gd b/sources/menus/login/login.gd index 53cdd49c..40cf922a 100644 --- a/sources/menus/login/login.gd +++ b/sources/menus/login/login.gd @@ -2,7 +2,7 @@ extends Control const TEACHER_PASSWORD: String = "42" const BACK_SCENE_PATH: String = "res://sources/menus/main/main_menu.tscn" -const NEXT_SCENE_PATH: String = "res://sources/gardens/gardens.tscn" +const NEXT_SCENE: PackedScene = preload("res://sources/gardens/gardens.tscn") const TEACHER_SCENE_PATH: String = "res://sources/menus/settings/teacher_settings.tscn" const DEVELOPER_SCENE_PATH: String = "res://sources/menus/settings/developer_settings.tscn" const PACKAGE_LOADER_SCENE_PATH: String = "res://sources/menus/language_selection/package_downloader.tscn" @@ -65,8 +65,8 @@ func _on_code_keyboard_password_entered(password: String) -> void: kalulu_button.hide() await kalulu.play_kalulu_speech(right_password_speech) await OpeningCurtain.close() - Log.trace("LoginScreen: Start loading next scene %s" % NEXT_SCENE_PATH) - get_tree().change_scene_to_file(NEXT_SCENE_PATH) + Log.trace("LoginScreen: Start loading next scene") + get_tree().change_scene_to_packed(NEXT_SCENE) Log.trace("LoginScreen: End loading next scene") else: Log.warn("LoginScreen: Unknown student code entered (length=%d)" % password.length()) diff --git a/sources/ui/popup.gd b/sources/ui/popup.gd index 60d8c7d8..053265a2 100644 --- a/sources/ui/popup.gd +++ b/sources/ui/popup.gd @@ -37,9 +37,9 @@ func _set_cancel_text(p_content_text: String) -> void: cancel_button.text = p_content_text -func set_buttons_visible(is_visible: bool) -> void: - confirm_button.visible = is_visible - cancel_button.visible = is_visible +func set_buttons_visible(is_button_visible: bool) -> void: + confirm_button.visible = is_button_visible + cancel_button.visible = is_button_visible func set_buttons_enabled(is_enabled: bool) -> void: diff --git a/sources/utils/autoloads/log.gd b/sources/utils/autoloads/log.gd index c14918bf..ffc87015 100644 --- a/sources/utils/autoloads/log.gd +++ b/sources/utils/autoloads/log.gd @@ -291,7 +291,7 @@ func _read_session_logs(session_files: Array) -> PackedStringArray: session_files.sort_custom(func(a: Dictionary, b: Dictionary) -> bool: return a["rotation"] < b["rotation"]) var session_lines: PackedStringArray = [] for file_info: Dictionary in session_files: - var path: String = LOG_PATH + String(file_info["file_name"]) + var path: String = LOG_PATH + String(file_info["file_name"] as String) var file: FileAccess = FileAccess.open(path, FileAccess.READ) if file == null: continue