From 742017a4cd5bacb9735973517b5dc28cd3de63f7 Mon Sep 17 00:00:00 2001
From: Jakub <birdt@citadel.tail9cfa84.ts.net>
Date: Tue, 28 Apr 2026 15:12:23 +0800
Subject: [PATCH 1/2] Experimenting with a basic loader structure

---
 engine/loader.scm       | 17 +++++++++++++++++
 samples/tic-tac-toe.scm | 16 +---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 engine/loader.scm

diff --git a/engine/loader.scm b/engine/loader.scm
new file mode 100644
index 0000000..b5fb09f
--- /dev/null
+++ b/engine/loader.scm
@@ -0,0 +1,17 @@
+(module (engine loader)
+(import (scheme)
+	(chicken base)
+	(chicken process-context)
+	(engine core)
+	(engine math)
+	(engine components core)
+	(engine drawing)
+	(engine input)
+	(engine scene)
+	raylib
+	(srfi 1)
+	(srfi 99))
+
+
+(load (last (command-line-arguments)))
+)
diff --git a/samples/tic-tac-toe.scm b/samples/tic-tac-toe.scm
index 65b3ed3..ab242e3 100644
--- a/samples/tic-tac-toe.scm
+++ b/samples/tic-tac-toe.scm
@@ -1,17 +1,3 @@
-(module (tic-tac-toe) ()
-(import scheme
-	(chicken base)
-	(chicken random)
-	(engine core)
-	(engine math)
-	(engine components core)
-	(engine drawing)
-	(engine input)
-	(engine scene)
-	raylib
-	(srfi 1)
-	(srfi 99))
-
 (register-event-bus 'turn-change)
 
 (define draw-text-entities
@@ -380,4 +366,4 @@
 
 ((main-menu))
 (create-window)
-)
+

From ac2284ce5c84ef36599c9ef2dd4a69ffb64c5591 Mon Sep 17 00:00:00 2001
From: BirDt_ <birdt_@cyan.sh>
Date: Tue, 28 Apr 2026 15:33:58 +0800
Subject: [PATCH 2/2] Environment fixes

---
 engine/loader.scm       |  7 ++++---
 samples/tic-tac-toe.scm | 12 +++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/engine/loader.scm b/engine/loader.scm
index b5fb09f..bcea717 100644
--- a/engine/loader.scm
+++ b/engine/loader.scm
@@ -1,4 +1,4 @@
-(module (engine loader)
+(module (engine loader) ()
 (import (scheme)
 	(chicken base)
 	(chicken process-context)
@@ -12,6 +12,7 @@
 	(srfi 1)
 	(srfi 99))
 
-
-(load (last (command-line-arguments)))
+(load (last (command-line-arguments))
+      (lambda (form)
+	(eval form (interaction-environment))))
 )
diff --git a/samples/tic-tac-toe.scm b/samples/tic-tac-toe.scm
index ab242e3..e2136c8 100644
--- a/samples/tic-tac-toe.scm
+++ b/samples/tic-tac-toe.scm
@@ -1,3 +1,14 @@
+(import (chicken random)
+	(engine core)
+	(engine math)
+	(engine components core)
+	(engine drawing)
+	(engine input)
+	(engine scene)
+	raylib
+	(srfi 1)
+	(srfi 99))
+
 (register-event-bus 'turn-change)
 
 (define draw-text-entities
@@ -366,4 +377,3 @@
 
 ((main-menu))
 (create-window)
-