From bcd7a629a2372145b87cccd42ee3c11d94918daa Mon Sep 17 00:00:00 2001 From: techrunner Date: Thu, 15 Aug 2024 02:02:09 -0500 Subject: [PATCH] Moved is_paused from player to GlobalSettings so that other game functions knows when it's paused --- Assets/scripts/Pause Screen.gd | 2 ++ Assets/scripts/game.gd | 6 +++--- Assets/scripts/player.gd | 8 +++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/scripts/Pause Screen.gd b/Assets/scripts/Pause Screen.gd index 9667a09..92d0bb3 100644 --- a/Assets/scripts/Pause Screen.gd +++ b/Assets/scripts/Pause Screen.gd @@ -19,8 +19,10 @@ func pause_game_button(): $"Pause Menu".hide() hide() Input.mouse_mode = Input.MOUSE_MODE_CAPTURED + GlobalSettings.is_paused = false emit_signal("unpaused") else: + GlobalSettings.is_paused = true show() $"Pause Menu".show() Input.mouse_mode = Input.MOUSE_MODE_VISIBLE diff --git a/Assets/scripts/game.gd b/Assets/scripts/game.gd index 9d4d384..75ac065 100644 --- a/Assets/scripts/game.gd +++ b/Assets/scripts/game.gd @@ -1,11 +1,11 @@ extends Node3D func _on_pause_menu_paused(): - $"player".is_paused = true + GlobalSettings.is_paused = true func _on_pause_menu_unpaused(): - $"player".is_paused = false + GlobalSettings.is_paused = false func GameOver(): $"Game Over".show() - $player.is_paused = true + GlobalSettings.is_paused = true diff --git a/Assets/scripts/player.gd b/Assets/scripts/player.gd index 7002d3a..11bd2d5 100644 --- a/Assets/scripts/player.gd +++ b/Assets/scripts/player.gd @@ -21,13 +21,11 @@ var vapes_per_min = 0 var mouse_sensitivity = 0.02 var joystick_sensitity = 2 -var is_paused = false - # Get the gravity from the project settings to be synced with RigidBody nodes. var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") func _physics_process(delta): - if not is_paused: + if not GlobalSettings.is_paused: # Add the gravity. if not is_on_floor(): velocity.y -= gravity * delta @@ -60,7 +58,7 @@ func _process(delta): if vapes_per_min == randi_range(10,20): will_cough = true vapes_per_min = 0 - if is_paused: + if GlobalSettings.is_paused: $Head/Crosshair.hide() $Head/RayCast3D/Prompt.hide() elif not $Head/Crosshair.visible: @@ -70,7 +68,7 @@ func _process(delta): func _input(event): if event.is_action("ui_text_backspace"): respawn() - if not is_paused: + if not GlobalSettings.is_paused: if event is InputEventMouseMotion: rotate_y(-event.relative.x * (GlobalSettings.GetSetting(GlobalSettings.Setting.Mouse_Speed)) / 100)