techrunner/HorrorGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused variable

Browse Source
This commit is contained in:
Willow Behar
2024-05-09 18:41:23 -05:00
parent 6357f92d68
commit e20239108c
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/components/Pause Screen.tscn
View File

@ -12,7 +12,6 @@ grow_vertical = 2
script = ExtResource("1_tqif2") script = ExtResource("1_tqif2")
[node name="Pause Menu" type="Control" parent="."] [node name="Pause Menu" type="Control" parent="."]
visible = false
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -131,6 +130,7 @@ text = "Joystick Sensativity"
[node name="HSlider" type="HSlider" parent="Settings/VBoxContainer/ColorRect2/HSplitContainer"] [node name="HSlider" type="HSlider" parent="Settings/VBoxContainer/ColorRect2/HSplitContainer"]
layout_mode = 2 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/Resume" to="." method="_on_resume_pressed"]
[connection signal="pressed" from="Pause Menu/Menu/Settings" to="." method="_on_settings_pressed"] [connection signal="pressed" from="Pause Menu/Menu/Settings" to="." method="_on_settings_pressed"]

1
Assets/game.tscn
View File

@ -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="."] [node name="Map" type="Node3D" parent="."]
script = ExtResource("4_cjwjg") 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="paused" from="Pause Menu" to="." method="_on_pause_menu_paused"]
[connection signal="unpaused" from="Pause Menu" to="." method="_on_pause_menu_unpaused"] [connection signal="unpaused" from="Pause Menu" to="." method="_on_pause_menu_unpaused"]

6
Assets/scripts/Main Menu.gd
View File

@ -1,6 +1,6 @@
extends Control extends Control
signal startGame(path) signal startGame
var load_list = ["Back"] var load_list = ["Back"]
@export var level_folder = "res://Assets/Levels" @export var level_folder = "res://Assets/Levels"
@ -20,8 +20,8 @@ func _on_exit_pressed():
func _on_start_pressed(): func _on_start_pressed():
emit_signal("startGame", "res://Assets/Levels/TestMapHospitalTextures.tscn")
GlobalSettings.current_map = "res://Assets/Levels/TestMapHospitalTextures.tscn" GlobalSettings.current_map = "res://Assets/Levels/TestMapHospitalTextures.tscn"
emit_signal("startGame")
func _on_settings_pressed(): func _on_settings_pressed():
pass # Replace with function body. pass # Replace with function body.
@ -37,4 +37,4 @@ func _on_item_list_item_clicked(index, at_position, mouse_button_index):
$VBoxContainer.show() $VBoxContainer.show()
else: else:
GlobalSettings.current_map = "res://Assets/Levels/" + load_list[index] GlobalSettings.current_map = "res://Assets/Levels/" + load_list[index]
emit_signal("startGame", GlobalSettings.current_map) emit_signal("startGame")

3
Assets/scripts/game.gd
View File

@ -1,7 +1,10 @@
extends Node3D extends Node3D
func _on_pause_menu_paused(): func _on_pause_menu_paused():
$"player".is_paused = true $"player".is_paused = true
func _on_pause_menu_unpaused(): func _on_pause_menu_unpaused():
$"player".is_paused = false $"player".is_paused = false

5
Assets/scripts/game_window.gd
View File

@ -1,8 +1,7 @@
extends Node extends Node
func _on_main_menu_start_game():
func _on_main_menu_start_game(path):
var game = load("res://Assets/game.tscn").instantiate() var game = load("res://Assets/game.tscn").instantiate()
self.remove_child($"Main Menu") remove_child($"Main Menu")
self.add_child(game) self.add_child(game)