1 files changed, 25 insertions, 16 deletions

diff --git a/src/crepe/api/SceneManager.cpp b/src/crepe/api/SceneManager.cpp
index 08f036d..57ec302 100644
--- a/src/crepe/api/SceneManager.cpp
+++ b/src/crepe/api/SceneManager.cpp
@@ -1,3 +1,6 @@
+#include <algorithm>
+#include <memory>
+
 #include "../ComponentManager.h"
 
 #include "SceneManager.h"
@@ -5,30 +8,36 @@
 using namespace crepe;
 using namespace std;
 
-SceneManager::SceneManager() {}
-
 SceneManager & SceneManager::get_instance() {
 	static SceneManager instance;
 	return instance;
 }
 
-// Set the next scene (this scene will be loaded at the end of the frame)
-void SceneManager::set_next_scene(const std::string & name) {
+void SceneManager::set_next_scene(const string & name) {
 	next_scene = name;
 }
 
-// Load a new scene (if there is one)
 void SceneManager::load_next_scene() {
-	if (!next_scene.empty()) {
-		for (auto & scene : scenes) {
-			if (scene->name == next_scene) {
-				// Delete all components of the current scene
-				ComponentManager & mgr = ComponentManager::get_instance();
-				mgr.delete_all_components();
-				// Load the new scene
-				scene->load_scene();
-				break;
-			}
+	// next scene not set
+	if (this->next_scene.empty())
+		return;
+
+	auto it = find_if(this->scenes.begin(), this->scenes.end(),
+		[&next_scene = this->next_scene] (unique_ptr<Scene> & scene) {
+			return scene->name == next_scene;
 		}
-	}
+	);
+
+	// next scene not found
+	if (it == this->scenes.end())
+		return;
+	unique_ptr<Scene> & scene = *it;
+
+	// Delete all components of the current scene
+	ComponentManager & mgr = ComponentManager::get_instance();
+	mgr.delete_all_components();
+
+	// Load the new scene
+	scene->load_scene();
 }
+