From d310459cf4db8718df1a30bef5309ff8a0e69da7 Mon Sep 17 00:00:00 2001
From: = <stanbremer056@gmail.com>
Date: Mon, 12 Jan 2026 19:34:03 +0100
Subject: [PATCH 1/2] Changed `Player`'s `Engine` reference from non-const to
 `const`

---
 lib/include/chomper/player.hpp | 12 ++++++++++--
 lib/src/player.cpp             |  9 ++++++---
 lib/src/runtimes/game.cpp      |  6 ++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/include/chomper/player.hpp b/lib/include/chomper/player.hpp
index 065b01c..003682d 100644
--- a/lib/include/chomper/player.hpp
+++ b/lib/include/chomper/player.hpp
@@ -13,11 +13,17 @@ class Engine;
 
 class Player : public IController::IListener, public IDebugInspector, public klib::Pinned {
   public:
-	explicit Player(le::input::ScopedActionMapping& mapping, gsl::not_null<Engine*> engine);
+	struct Info {
+		bool alive = true;
+	};
+
+	explicit Player(le::input::ScopedActionMapping& mapping, gsl::not_null<Engine const*> engine);
 
 	void tick(kvf::Seconds dt);
 	void draw(le::IRenderer& renderer) const;
 
+	[[nodiscard]] Info getInfo() const;
+
   private:
 	[[nodiscard]] bool isCollidingWithSelf(glm::vec2 targetGrid) const;
 	[[nodiscard]] bool isCollidingWithWall(glm::vec2 targetGrid) const;
@@ -33,12 +39,14 @@ class Player : public IController::IListener, public IDebugInspector, public kli
 
 	klib::TypedLogger<Player> m_log{};
 
-	gsl::not_null<Engine*> m_engine;
+	gsl::not_null<Engine const*> m_engine;
 
 	std::unique_ptr<IController> m_controller{};
 
 	Snake m_snake{};
 
+	Info m_info{};
+
 	Heading m_heading{};
 	std::vector<Heading> m_headingQueue{};
 
diff --git a/lib/src/player.cpp b/lib/src/player.cpp
index 9cd6621..c8252aa 100644
--- a/lib/src/player.cpp
+++ b/lib/src/player.cpp
@@ -1,7 +1,6 @@
 #include "chomper/player.hpp"
 #include "chomper/controllers/player_controller.hpp"
 #include "chomper/engine.hpp"
-#include "chomper/runtimes/entrypoint.hpp"
 #include "chomper/world_space.hpp"
 #include <algorithm>
 
@@ -12,7 +11,7 @@ constexpr auto oppositeHeading_v = klib::EnumArray<Heading, Heading>{Heading::We
 constexpr auto headingToDir_v = klib::EnumArray<Heading, glm::vec2>{glm::vec2{1.f, 0.f}, glm::vec2{0.f, 1.f}, glm::vec2{-1.f, 0.f}, glm::vec2{0.f, -1.f}};
 } // namespace
 
-Player::Player(le::input::ScopedActionMapping& mapping, gsl::not_null<Engine*> engine) : m_engine(engine) {
+Player::Player(le::input::ScopedActionMapping& mapping, gsl::not_null<Engine const*> engine) : m_engine(engine) {
 	createController(mapping);
 }
 
@@ -27,6 +26,10 @@ void Player::tick(kvf::Seconds dt) {
 	}
 }
 
+Player::Info Player::getInfo() const {
+	return m_info;
+}
+
 bool Player::isCollidingWithSelf(glm::vec2 const targetGrid) const {
 	if (m_snake.getSegments().empty()) {
 		return false;
@@ -57,7 +60,7 @@ void Player::move() {
 	auto const targetGrid = worldSpace::worldToGrid(m_snake.getSegments().back().transform.position) + headingToDir_v[m_heading];
 	if (isCollidingWithSelf(targetGrid) || isCollidingWithWall(targetGrid)) {
 		if (m_graceMove) {
-			m_engine->setNextRuntime<runtime::Entrypoint>();
+			m_info.alive = false;
 		} else {
 			m_graceMove = true;
 		}
diff --git a/lib/src/runtimes/game.cpp b/lib/src/runtimes/game.cpp
index 5c2d27a..740158b 100644
--- a/lib/src/runtimes/game.cpp
+++ b/lib/src/runtimes/game.cpp
@@ -1,5 +1,6 @@
 #include "chomper/runtimes/game.hpp"
 #include "chomper/im_util.hpp"
+#include "chomper/runtimes/entrypoint.hpp"
 #include <array>
 
 namespace chomper::runtime {
@@ -18,6 +19,11 @@ void Game::tick(kvf::Seconds const dt) {
 		debugInspectWindow();
 	}
 	ImGui::End();
+
+	// On death
+	if (!m_player->getInfo().alive) {
+		m_engine->setNextRuntime<runtime::Entrypoint>();
+	}
 }
 
 void Game::render(le::IRenderer& renderer) const {

From 79c9db9bf1128286af50bd382afee6b8cac631cc Mon Sep 17 00:00:00 2001
From: = <stanbremer056@gmail.com>
Date: Mon, 12 Jan 2026 19:47:32 +0100
Subject: [PATCH 2/2] Add requested changes

---
 lib/include/chomper/player.hpp | 2 +-
 lib/src/player.cpp             | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/include/chomper/player.hpp b/lib/include/chomper/player.hpp
index 003682d..0005964 100644
--- a/lib/include/chomper/player.hpp
+++ b/lib/include/chomper/player.hpp
@@ -22,7 +22,7 @@ class Player : public IController::IListener, public IDebugInspector, public kli
 	void tick(kvf::Seconds dt);
 	void draw(le::IRenderer& renderer) const;
 
-	[[nodiscard]] Info getInfo() const;
+	[[nodiscard]] Info const& getInfo() const;
 
   private:
 	[[nodiscard]] bool isCollidingWithSelf(glm::vec2 targetGrid) const;
diff --git a/lib/src/player.cpp b/lib/src/player.cpp
index c8252aa..aaf5d0f 100644
--- a/lib/src/player.cpp
+++ b/lib/src/player.cpp
@@ -16,6 +16,10 @@ Player::Player(le::input::ScopedActionMapping& mapping, gsl::not_null<Engine con
 }
 
 void Player::tick(kvf::Seconds dt) {
+	if (!m_info.alive) {
+		return;
+	}
+
 	m_controller->tick(dt);
 
 	m_moveTimer += dt;
@@ -26,7 +30,7 @@ void Player::tick(kvf::Seconds dt) {
 	}
 }
 
-Player::Info Player::getInfo() const {
+Player::Info const& Player::getInfo() const {
 	return m_info;
 }