From 317aed8f1b4ab6ec6143cdfadd6f5053e8b31204 Mon Sep 17 00:00:00 2001
From: Sara <sara@saragerretsen.nl>
Date: Tue, 21 May 2024 15:59:19 +0200
Subject: [PATCH] feat: better level loading

---
 src/end_screen.cpp           |  5 ++---
 src/end_screen.hpp           |  2 +-
 src/menu_ui.cpp              |  5 ++---
 src/menu_ui.hpp              |  2 +-
 src/rally_rush_game_mode.cpp | 10 ++--------
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/end_screen.cpp b/src/end_screen.cpp
index 05b3dd0..5c18c23 100644
--- a/src/end_screen.cpp
+++ b/src/end_screen.cpp
@@ -11,7 +11,7 @@ void EndScreen::_bind_methods() {
     GDPROPERTY_HINTED(game_scene, Variant::OBJECT, PROPERTY_HINT_RESOURCE_TYPE, "PackedScene");
 }
 
-void EndScreen::_enter_tree() { GDGAMEONLY();
+void EndScreen::_ready() { GDGAMEONLY();
     Button *restart_button = this->get_node<Button>("RestartButton");
     restart_button->connect("button_down", callable_mp(this, &EndScreen::restart));
     restart_button->grab_focus();
@@ -20,8 +20,7 @@ void EndScreen::_enter_tree() { GDGAMEONLY();
 }
 
 void EndScreen::return_to_main() {
-    this->get_owner()->queue_free();
-    GameRoot3D::get_singleton()->load_level(this->main_menu_scene);
+    GameRoot3D::get_singleton()->replace_levels(this->main_menu_scene);
 }
 
 void EndScreen::restart() {
diff --git a/src/end_screen.hpp b/src/end_screen.hpp
index 6a498a0..ff8ca27 100644
--- a/src/end_screen.hpp
+++ b/src/end_screen.hpp
@@ -8,7 +8,7 @@ class EndScreen : public CanvasLayer {
     GDCLASS(EndScreen, CanvasLayer);
     static void _bind_methods();
 public:
-    virtual void _enter_tree() override;
+    virtual void _ready() override;
 
     void return_to_main();
     void restart();
diff --git a/src/menu_ui.cpp b/src/menu_ui.cpp
index 4066a1e..47aa6d8 100644
--- a/src/menu_ui.cpp
+++ b/src/menu_ui.cpp
@@ -12,7 +12,7 @@ void MenuUI::_bind_methods() {
     GDPROPERTY_HINTED(game_scene, Variant::OBJECT, PROPERTY_HINT_RESOURCE_TYPE, "PackedScene");
 }
 
-void MenuUI::_enter_tree() { GDGAMEONLY();
+void MenuUI::_ready() { GDGAMEONLY();
     Button *start_button = this->get_node<Button>("StartButton");
     start_button->connect("button_down", callable_mp(this, &MenuUI::start_game));
     start_button->grab_focus();
@@ -23,8 +23,7 @@ void MenuUI::_enter_tree() { GDGAMEONLY();
 }
 
 void MenuUI::start_game() {
-    this->get_parent()->queue_free();
-    GameRoot3D::get_singleton()->load_level(this->game_scene);
+    GameRoot3D::get_singleton()->replace_levels(this->game_scene);
 }
 
 void MenuUI::toggle_controls() {
diff --git a/src/menu_ui.hpp b/src/menu_ui.hpp
index ac1f98a..b998ed6 100644
--- a/src/menu_ui.hpp
+++ b/src/menu_ui.hpp
@@ -11,7 +11,7 @@ class MenuUI : public CanvasLayer {
     GDCLASS(MenuUI, CanvasLayer);
     static void _bind_methods();
 public:
-    virtual void _enter_tree() override;
+    virtual void _ready() override;
 
     void start_game();
     void toggle_controls();
diff --git a/src/rally_rush_game_mode.cpp b/src/rally_rush_game_mode.cpp
index e9983de..c076d1f 100644
--- a/src/rally_rush_game_mode.cpp
+++ b/src/rally_rush_game_mode.cpp
@@ -23,16 +23,10 @@ void RallyRushGameMode::notify_key_found() {
 }
 
 void RallyRushGameMode::notify_player_death() {
-    GameRoot3D *root = GameRoot3D::get_singleton();
-    HashMap<StringName, Level3D*> levels = root->get_levels();
-    for(KeyValue<StringName, Level3D*> &kvp : levels)
-        if(kvp.value->is_inside_tree())
-            kvp.value->queue_free();
-    root->get_levels().clear();
-    root->load_level(ResourceLoader::get_singleton()->load("res://game_end_screen.tscn"));
-    root->reset_game_mode();
+    GameRoot3D::get_singleton()->replace_levels(ResourceLoader::get_singleton()->load("res://game_end_screen.tscn"));
 }
 
 void RallyRushGameMode::notify_player_escaped() {
+    GameRoot3D::get_singleton()->replace_levels(ResourceLoader::get_singleton()->load("res://game_end_screen.tscn"));
 }
 }