From e20239108c4b336c1024d5daf682f60a6806831c Mon Sep 17 00:00:00 2001 From: Willow Behar <2364126-TechRunner@users.noreply.gitlab.com> Date: Thu, 9 May 2024 18:41:23 -0500 Subject: [PATCH] Removed unused variable --- Assets/components/Pause Screen.tscn | 2 +- Assets/game.tscn | 1 + Assets/scripts/Main Menu.gd | 6 +++--- Assets/scripts/game.gd | 3 +++ Assets/scripts/game_window.gd | 5 ++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Assets/components/Pause Screen.tscn b/Assets/components/Pause Screen.tscn index f279f42..9ef94c2 100644 --- a/Assets/components/Pause Screen.tscn +++ b/Assets/components/Pause Screen.tscn @@ -12,7 +12,6 @@ grow_vertical = 2 script = ExtResource("1_tqif2") [node name="Pause Menu" type="Control" parent="."] -visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -131,6 +130,7 @@ text = "Joystick Sensativity" [node name="HSlider" type="HSlider" parent="Settings/VBoxContainer/ColorRect2/HSplitContainer"] layout_mode = 2 +size_flags_horizontal = 4 [connection signal="pressed" from="Pause Menu/Menu/Resume" to="." method="_on_resume_pressed"] [connection signal="pressed" from="Pause Menu/Menu/Settings" to="." method="_on_settings_pressed"] diff --git a/Assets/game.tscn b/Assets/game.tscn index e0bb442..8e3bfca 100644 --- a/Assets/game.tscn +++ b/Assets/game.tscn @@ -17,5 +17,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.36293, 0) [node name="Map" type="Node3D" parent="."] script = ExtResource("4_cjwjg") +[connection signal="exitLevel" from="Pause Menu" to="." method="_on_pause_menu_exit_level"] [connection signal="paused" from="Pause Menu" to="." method="_on_pause_menu_paused"] [connection signal="unpaused" from="Pause Menu" to="." method="_on_pause_menu_unpaused"] diff --git a/Assets/scripts/Main Menu.gd b/Assets/scripts/Main Menu.gd index c715adb..b6b9a1b 100644 --- a/Assets/scripts/Main Menu.gd +++ b/Assets/scripts/Main Menu.gd @@ -1,6 +1,6 @@ extends Control -signal startGame(path) +signal startGame var load_list = ["Back"] @export var level_folder = "res://Assets/Levels" @@ -20,8 +20,8 @@ func _on_exit_pressed(): func _on_start_pressed(): - emit_signal("startGame", "res://Assets/Levels/TestMapHospitalTextures.tscn") GlobalSettings.current_map = "res://Assets/Levels/TestMapHospitalTextures.tscn" + emit_signal("startGame") func _on_settings_pressed(): pass # Replace with function body. @@ -37,4 +37,4 @@ func _on_item_list_item_clicked(index, at_position, mouse_button_index): $VBoxContainer.show() else: GlobalSettings.current_map = "res://Assets/Levels/" + load_list[index] - emit_signal("startGame", GlobalSettings.current_map) + emit_signal("startGame") diff --git a/Assets/scripts/game.gd b/Assets/scripts/game.gd index 8e8093d..9707de6 100644 --- a/Assets/scripts/game.gd +++ b/Assets/scripts/game.gd @@ -1,7 +1,10 @@ extends Node3D + func _on_pause_menu_paused(): $"player".is_paused = true func _on_pause_menu_unpaused(): $"player".is_paused = false + + diff --git a/Assets/scripts/game_window.gd b/Assets/scripts/game_window.gd index 02f64cd..706c6eb 100644 --- a/Assets/scripts/game_window.gd +++ b/Assets/scripts/game_window.gd @@ -1,8 +1,7 @@ extends Node - -func _on_main_menu_start_game(path): +func _on_main_menu_start_game(): var game = load("res://Assets/game.tscn").instantiate() - self.remove_child($"Main Menu") + remove_child($"Main Menu") self.add_child(game)