From 349dbfcab93616bc154baf136ea6d4b5e28e3d87 Mon Sep 17 00:00:00 2001
From: Bill Rossi <bassguitarbill@gmail.com>
Date: Sat, 4 Jan 2025 04:45:44 -0500
Subject: [PATCH] Fix issue with uninitialized memory

---
 01_text_adventure/game.c    | 41 +++++++++++++++++++++++++++++++++----
 01_text_adventure/game.h    | 14 +++++++------
 01_text_adventure/input.c   |  2 +-
 01_text_adventure/input.h   |  2 +-
 01_text_adventure/main.c    | 17 +++++++--------
 01_text_adventure/room.h    |  6 ++++++
 01_text_adventure/rooms.txt |  3 +++
 7 files changed, 63 insertions(+), 22 deletions(-)
 create mode 100644 01_text_adventure/rooms.txt

diff --git a/01_text_adventure/game.c b/01_text_adventure/game.c
index 74320cb..486d53c 100644
--- a/01_text_adventure/game.c
+++ b/01_text_adventure/game.c
@@ -1,10 +1,43 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include "game.h"
 
-void gs_handle_command(GameState *gs, const char *command) {
-  Input *input = gs->input;
+Game *game_create(void) {
+  Game *g = malloc(sizeof(Game));
+  g->should_close = false;
+  g->rooms.count = 0;
+}
+
+void game_handle_command(Game *g, const char *command) {
+  Input *input = g->input;
   if (strcmp(input->input_buffer, "QUIT") == 0) {
-    *(gs->should_close) = true;
+    g->should_close = true;
   } else if (strcmp(input->input_buffer, "LOOK") == 0) {
-    push_line_to_log(input->log, gs->rooms[0].description);
+    push_line_to_log(input->log, g->current_room->description);
   }
 }
+
+#define ROOMS_PATH "./rooms.txt"
+#define MAX_ROOM_COUNT 100
+
+char room_buffer[2001];
+
+void game_load_rooms(Game *g) {
+  FILE *rooms_file = fopen(ROOMS_PATH, "r");
+
+  while ((fgets(room_buffer, 2000, rooms_file)) != NULL) {
+
+    char *token = strtok(room_buffer, "|");
+
+    g->rooms.rooms[g->rooms.count].name = malloc(strlen(token) + 1);
+    strcpy(g->rooms.rooms[g->rooms.count].name, token);
+
+    token = strtok(NULL, "|");
+    g->rooms.rooms[g->rooms.count].description = malloc(strlen(token) + 1);
+    strcpy(g->rooms.rooms[g->rooms.count].description, token);
+    
+    g->rooms.count++;
+  }
+  fclose(rooms_file);
+}
diff --git a/01_text_adventure/game.h b/01_text_adventure/game.h
index fcd5d67..bc0beb1 100644
--- a/01_text_adventure/game.h
+++ b/01_text_adventure/game.h
@@ -2,17 +2,19 @@
 #define _FD_GAME_
 
 #include <stdbool.h>
-typedef struct GameState GameState;
+typedef struct Game Game;
 #include "input.h"
 #include "room.h"
 
-struct GameState {
-  bool *should_close;
+struct Game {
+  bool should_close;
   Input *input;
-  Room *rooms;
-  int rooms_count;
+  Rooms rooms;
+  Room *current_room;
 };
 
-void gs_handle_command(GameState *gs, const char *command);
+Game *game_create(void);
+void game_handle_command(Game *g, const char *command);
+void game_load_rooms(Game *g);
 
 #endif
diff --git a/01_text_adventure/input.c b/01_text_adventure/input.c
index 6e7ff88..1f06e29 100644
--- a/01_text_adventure/input.c
+++ b/01_text_adventure/input.c
@@ -39,7 +39,7 @@ void handleKeyPress(Input *input, int c) {
     pop_character(input);
   } else if (c == ENTER) {
     push_command_to_log(input);
-    gs_handle_command(input->gs, input->input_buffer);
+    game_handle_command(input->g, input->input_buffer);
     clear_input_buffer(input);
   } else if ((c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == ' ') {
     push_character(input, (char) c);
diff --git a/01_text_adventure/input.h b/01_text_adventure/input.h
index b3a3f57..b65d930 100644
--- a/01_text_adventure/input.h
+++ b/01_text_adventure/input.h
@@ -14,7 +14,7 @@ struct Input {
   int input_length;
   Vector2 position;
   Log *log;
-  GameState *gs;
+  Game *g;
 };
 
 void handle_pressed_keys(Input*);
diff --git a/01_text_adventure/main.c b/01_text_adventure/main.c
index 4a0b855..e273541 100644
--- a/01_text_adventure/main.c
+++ b/01_text_adventure/main.c
@@ -4,6 +4,7 @@
 #include "input.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <stdbool.h>
 
 #define TARGET_FPS 60
@@ -12,24 +13,20 @@ int main(void) {
     InitWindow(800, 450, "Text Adventure");
     SetTargetFPS(TARGET_FPS);
 
-    GameState *gs = malloc(sizeof(GameState));
-    gs->should_close = malloc(1);
-    *(gs->should_close) = false;
+    Game *g = game_create();
 
     Log *log = create_log();
     Vector2 input_position = { 190, 200 };
     Input *input = create_input(input_position);
     input->log = log;
-    input->gs = gs;
+    input->g = g;
     input->command = '>'; // Don't change this
-    gs->input = input;
+    g->input = input;
 
-    gs->rooms = malloc(sizeof(Room));
-    Room *room = &gs->rooms[0];
-    room->name = "First room";
-    room->description = "You are in an enormous room. It is big but empty.";
+    game_load_rooms(g);
+    g->current_room = &g->rooms.rooms[0];
 
-    while (!WindowShouldClose() && !*(gs->should_close))
+    while (!WindowShouldClose() && !g->should_close)
       {
 	BeginDrawing();
 	ClearBackground(BLACK);
diff --git a/01_text_adventure/room.h b/01_text_adventure/room.h
index 5e7bb51..74dc994 100644
--- a/01_text_adventure/room.h
+++ b/01_text_adventure/room.h
@@ -2,10 +2,16 @@
 #define _FD_ROOM_
 
 typedef struct Room Room;
+typedef struct Rooms Rooms;
 
 struct Room {
   char *name;
   char *description;
 };
 
+struct Rooms {
+  Room rooms[100];
+  int count;
+};
+
 #endif
diff --git a/01_text_adventure/rooms.txt b/01_text_adventure/rooms.txt
new file mode 100644
index 0000000..320d9d2
--- /dev/null
+++ b/01_text_adventure/rooms.txt
@@ -0,0 +1,3 @@
+FIRST_ROOM|This is the initial room in the game. Nothing special about it.
+SECOND_ROOM|This is another room. This one is painted blue.
+LAST_ROOM|Another unremarkable room.