From 069fdae20dab2a7190af9642bfdc384a8c2d582b Mon Sep 17 00:00:00 2001 From: unfa Date: Sun, 12 Sep 2021 13:34:54 +0200 Subject: [PATCH] Disabled awaits in SoundPlayer --- Game/Assets/Audio/SoundPlayer.gd | 2 +- Game/Assets/Weapons/Weapon.tscn | 2 +- Game/Main.gd | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Game/Assets/Audio/SoundPlayer.gd b/Game/Assets/Audio/SoundPlayer.gd index 5ff6d1b..e2703c3 100644 --- a/Game/Assets/Audio/SoundPlayer.gd +++ b/Game/Assets/Audio/SoundPlayer.gd @@ -103,7 +103,7 @@ func _ready(): print("voices: ", voices) if AutoPlay: - await play() + play() func pick_random(): assert(len(clips) > 0, "SoundPlayer has no clips to choose from") diff --git a/Game/Assets/Weapons/Weapon.tscn b/Game/Assets/Weapons/Weapon.tscn index 8f49451..19b3ee5 100644 --- a/Game/Assets/Weapons/Weapon.tscn +++ b/Game/Assets/Weapons/Weapon.tscn @@ -53,7 +53,7 @@ SoundClip = "res://Assets/SFX/Weapons_HandgunShot_01.wav" Voice_Count = 2 [node name="AudioStreamPlayer3D" parent="Handgun/SFX/Shoot" index="0"] -unit_db = 6.0 +unit_db = 8.0 unit_size = 8.0 max_db = 6.0 diff --git a/Game/Main.gd b/Game/Main.gd index 4b6881f..03ebaf9 100644 --- a/Game/Main.gd +++ b/Game/Main.gd @@ -240,6 +240,9 @@ func push_local_player_info(): # rpc(&'player_list_update', player_list.get(id).serialize(), get_tree().multiplayer.get_network_unique_id()) @rpc(sync,auth,reliable) func destroy_player(pid: int): + + assert($Players.has_node(str(pid)), "Attempting to destroy a player that does not exist") + var player_node = $Players.get_node(str(pid))