From 00c7e619c16fc7653436bfa34cf2cba31b2a7130 Mon Sep 17 00:00:00 2001
From: Bill Rossi <bassguitarbill@gmail.com>
Date: Sat, 4 Jan 2025 05:01:06 -0500
Subject: [PATCH] Additional `free` code, plus refactoring

---
 01_text_adventure/game.c | 44 ++++++++++++++++++++++++++++++++++++++++
 01_text_adventure/game.h |  6 ++++++
 01_text_adventure/main.c | 23 ++-------------------
 01_text_adventure/room.c | 14 +++++++++++++
 01_text_adventure/room.h |  3 +++
 5 files changed, 69 insertions(+), 21 deletions(-)
 create mode 100644 01_text_adventure/room.c

diff --git a/01_text_adventure/game.c b/01_text_adventure/game.c
index 486d53c..5c9393a 100644
--- a/01_text_adventure/game.c
+++ b/01_text_adventure/game.c
@@ -2,11 +2,33 @@
 #include <string.h>
 #include <stdlib.h>
 #include "game.h"
+#include "input.h"
+#include "log.h"
 
 Game *game_create(void) {
   Game *g = malloc(sizeof(Game));
   g->should_close = false;
   g->rooms.count = 0;
+
+  Log *log = create_log();
+  g->log = log;
+
+  Vector2 input_position = { 190, 200 };
+  Input *input = create_input(input_position);
+  input->log = log;
+  input->g = g;
+  input->command = '>'; // Don't change this
+
+  g->input = input;
+
+  return g;
+}
+
+void free_game(Game *g) {
+  free_rooms(g->rooms);
+  free_input(g->input);
+  free_log(g->log);
+  free(g);
 }
 
 void game_handle_command(Game *g, const char *command) {
@@ -40,4 +62,26 @@ void game_load_rooms(Game *g) {
     g->rooms.count++;
   }
   fclose(rooms_file);
+
+  g->current_room = &g->rooms.rooms[0];
+}
+
+void game_handle_input(Game *g) {
+  handle_pressed_keys(g->input);
+}
+
+void game_draw(Game *g) {
+  BeginDrawing();
+  ClearBackground(BLACK);
+  draw_log(g->log);
+  draw_text(g->input);
+  EndDrawing();
+}
+
+void game_run_until_close(Game *g) {
+  while (!WindowShouldClose() && !g->should_close)
+    {
+      game_handle_input(g);
+      game_draw(g);
+    }
 }
diff --git a/01_text_adventure/game.h b/01_text_adventure/game.h
index bc0beb1..c2dd838 100644
--- a/01_text_adventure/game.h
+++ b/01_text_adventure/game.h
@@ -5,10 +5,12 @@
 typedef struct Game Game;
 #include "input.h"
 #include "room.h"
+#include "log.h"
 
 struct Game {
   bool should_close;
   Input *input;
+  Log *log;
   Rooms rooms;
   Room *current_room;
 };
@@ -16,5 +18,9 @@ struct Game {
 Game *game_create(void);
 void game_handle_command(Game *g, const char *command);
 void game_load_rooms(Game *g);
+void game_run_until_close(Game *g);
+void game_handle_input(Game *g);
+void game_draw(Game *g);
+void free_game(Game *g);
 
 #endif
diff --git a/01_text_adventure/main.c b/01_text_adventure/main.c
index e273541..d037e9a 100644
--- a/01_text_adventure/main.c
+++ b/01_text_adventure/main.c
@@ -14,30 +14,11 @@ int main(void) {
     SetTargetFPS(TARGET_FPS);
 
     Game *g = game_create();
-
-    Log *log = create_log();
-    Vector2 input_position = { 190, 200 };
-    Input *input = create_input(input_position);
-    input->log = log;
-    input->g = g;
-    input->command = '>'; // Don't change this
-    g->input = input;
-
     game_load_rooms(g);
-    g->current_room = &g->rooms.rooms[0];
 
-    while (!WindowShouldClose() && !g->should_close)
-      {
-	BeginDrawing();
-	ClearBackground(BLACK);
-	handle_pressed_keys(input);
-	draw_log(log);
-	draw_text(input);
-        EndDrawing();
-    }
+    game_run_until_close(g);
     CloseWindow();
-    free_input(input);
-    free_log(log);
 
+    free_game(g);
     return 0;
 }
diff --git a/01_text_adventure/room.c b/01_text_adventure/room.c
new file mode 100644
index 0000000..ea154f5
--- /dev/null
+++ b/01_text_adventure/room.c
@@ -0,0 +1,14 @@
+#include <stdlib.h>
+#include "room.h"
+
+void free_room(Room r) {
+  free(r.name);
+  free(r.description);
+}
+
+void free_rooms(Rooms r) {
+  for (int i = 0; i < r.count; i++) {
+    free_room(r.rooms[i]);
+  }
+}
+
diff --git a/01_text_adventure/room.h b/01_text_adventure/room.h
index 74dc994..6e7a144 100644
--- a/01_text_adventure/room.h
+++ b/01_text_adventure/room.h
@@ -14,4 +14,7 @@ struct Rooms {
   int count;
 };
 
+void free_room(Room r);
+void free_rooms(Rooms r);
+
 #endif