Merge pull request #19 from Maaack/fix-errors

Fix errors and warnings
Maaack · Jan 4, 2024 · 3df1554 · 3df1554
2 parents bb734de + 571ee93
commit 3df1554
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/App/Scenes/Menus/OptionsMenu/Video/VideoOptionsMenu.gd b/App/Scenes/Menus/OptionsMenu/Video/VideoOptionsMenu.gd
@@ -44,7 +44,6 @@ func _update_resolution_options_enabled(window : Window):
 		resolution_options.tooltip_text = "Select a screen size"
 
 func _update_ui(window : Window):
-	var current_resolution : Vector2i = window.size
 	fullscreen_button.button_pressed = AppSettings.is_fullscreen(window)
 	_preselect_resolution(window)
 	_update_resolution_options_enabled(window)

diff --git a/App/Scripts/SceneLoader.gd b/App/Scripts/SceneLoader.gd
@@ -62,6 +62,9 @@ func _check_loading_screen() -> bool:
 		return false
 	return true
 
+func reload_current_scene() -> void:
+	get_tree().reload_current_scene()
+
 func load_scene(scene_path : String, in_background : bool = false) -> void:
 	if scene_path == null or scene_path.is_empty():
 		push_error("no path given to load")

diff --git a/Extras/Scenes/GameScene/GameUI.gd b/Extras/Scenes/GameScene/GameUI.gd
@@ -16,7 +16,7 @@ func _get_inputs_as_string():
 					all_inputs += " + " + action_name
 	return all_inputs
 
-func _process(delta):
+func _process(_delta):
 	if Input.is_anything_pressed():
 		$Label.text = _get_inputs_as_string()
 	else:

diff --git a/Extras/Scenes/Opening/Opening.gd b/Extras/Scenes/Opening/Opening.gd
@@ -7,7 +7,7 @@ extends Control
 
 func next():
 	var status = SceneLoader.get_status()
-	if SceneLoader.get_status() == ResourceLoader.THREAD_LOAD_LOADED:
+	if status == ResourceLoader.THREAD_LOAD_LOADED:
 		var packed_scene = SceneLoader.get_resource()
 		get_tree().change_scene_to_packed(packed_scene)
 	else: