develop #50

Merged
cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00
2 changed files with 17 additions and 3 deletions
Showing only changes of commit fe9cebc620 - Show all commits

View File

@ -51,6 +51,8 @@ void alai::player::Player::_init()
coins = 0; coins = 0;
notifier_initialized = false;
velocity = godot::Vector2(); velocity = godot::Vector2();
} }
@ -189,11 +191,18 @@ void alai::player::Player::_physics_process(float delta)
auto notifier = get_node<godot::VisibilityNotifier2D>("Camera2D/VisibilityNotifier2D"); auto notifier = get_node<godot::VisibilityNotifier2D>("Camera2D/VisibilityNotifier2D");
if (notifier != nullptr) if (notifier != nullptr)
{ {
if (!notifier->is_on_screen()) if (notifier->is_inside_tree() && !notifier->is_on_screen())
{ {
// The first time the notifier is checked always returns false in the first frame
// So skip the check from the first frame
if (notifier_initialized) {
auto event = get_node<alai::Event>("/root/Event"); auto event = get_node<alai::Event>("/root/Event");
event->emit_signal("player_died"); event->emit_signal("player_died");
} }
else {
notifier_initialized = true;
}
}
} }
else else
{ {

View File

@ -117,6 +117,11 @@ namespace alai
* *
*/ */
bool double_jump; bool double_jump;
/**
* @brief If the notifier for the player being on screen has been initialized or not.
*
*/
bool notifier_initialized;
public: public:
/** /**