From a34ca72577dc519b4c869f8d8afad684f75bb0e5 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Mon, 29 Aug 2022 20:17:12 -0400 Subject: [PATCH] fix sounds when jumping on enemy --- src/player/Player.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/player/Player.cpp b/src/player/Player.cpp index d60cc1d..bfe14a3 100644 --- a/src/player/Player.cpp +++ b/src/player/Player.cpp @@ -130,8 +130,13 @@ void alai::player::Player::_physics_process(float delta) WARN_PRINT("Enemies not found!"); dup->queue_free(); }*/ - auto jump_sound = get_parent()->get_node("Sounds/Jump"); - jump_sound->play(); + auto jump_sound = get_node("Sounds/Jump"); + if (jump_sound != nullptr) { + jump_sound->play(); + } + else { + WARN_PRINT("Player jump sound not found!"); + } velocity.y = -get_bounce_force(); } else if (collider->is_in_group("enemy") && (collider->is_in_group("rideable") && godot::Vector2::DOWN.dot(collision->get_normal()) > 0)) @@ -168,14 +173,6 @@ void alai::player::Player::_physics_process(float delta) { auto event = get_node("/root/Event"); event->emit_signal("player_died"); - /*if (get_parent()->get_class() == "TileMap") - { - auto error = get_tree()->change_scene("res://Main.tscn"); - if (error != godot::Error::OK) - { - ERR_PRINT(godot::String().num((int) error) + " Could not load scene!"); - } - }*/ } } @@ -273,9 +270,11 @@ godot::Vector2 alai::player::Player::get_velocity() void alai::player::Player::_on_player_touched() { - auto error = get_tree()->change_scene("res://Main.tscn"); + /*auto error = get_tree()->change_scene("res://Main.tscn"); if (error != godot::Error::OK) { ERR_PRINT(godot::String().num((int) error) + " Could not load scene!"); - } + }*/ + auto event = get_node("/root/Event"); + event->emit_signal("player_died"); }