From 03ab78940f174847a150a62779f1f0a3356f2d2d Mon Sep 17 00:00:00 2001
From: Bill Rossi <bassguitarbill@gmail.com>
Date: Sun, 19 Jan 2025 08:39:00 -0500
Subject: [PATCH] Cleanup

---
 01_text_adventure/flag.c       |  1 -
 01_text_adventure/game.c       |  2 +-
 01_text_adventure/game.h       |  6 +++---
 01_text_adventure/main.c       | 27 ---------------------------
 01_text_adventure/transition.c |  2 +-
 01_text_adventure/transition.h |  4 ++--
 01_text_adventure/word.h       |  1 +
 7 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/01_text_adventure/flag.c b/01_text_adventure/flag.c
index efd648e..7d379bf 100644
--- a/01_text_adventure/flag.c
+++ b/01_text_adventure/flag.c
@@ -13,7 +13,6 @@ void load_flag(Game *g, char *line) {
 
   token = strtok(NULL, "|");
   flag->value = atoi(token);
-  printf("AGH %s\n", token);
 
   g->flags->count++;
 }
diff --git a/01_text_adventure/game.c b/01_text_adventure/game.c
index 09990af..a2ef2f6 100644
--- a/01_text_adventure/game.c
+++ b/01_text_adventure/game.c
@@ -67,7 +67,7 @@ bool string_in(const char *input, ...) {
   return false;
 }
 
-Command command_from_string(const char *string) {
+CommandType command_from_string(const char *string) {
   if (string_in(string, "QUIT", "Q", "EXIT", "CLOSE", NULL)) {
     return COMMAND_QUIT;
   }
diff --git a/01_text_adventure/game.h b/01_text_adventure/game.h
index a12e666..38b5c57 100644
--- a/01_text_adventure/game.h
+++ b/01_text_adventure/game.h
@@ -3,7 +3,7 @@
 
 typedef struct Game Game;
 
-typedef enum Command {
+typedef enum CommandType {
   COMMAND_LOOK,
   COMMAND_QUIT,
   COMMAND_UNKNOWN,
@@ -11,7 +11,7 @@ typedef enum Command {
   COMMAND_SOUTH,
   COMMAND_EAST,
   COMMAND_WEST,
-} Command;
+} CommandType;
 
 #include <stdbool.h>
 #include "input.h"
@@ -35,7 +35,7 @@ struct Game {
 };
 
 Game *game_create(void);
-Command command_from_string(const char *string);
+CommandType command_from_string(const char *string);
 void game_handle_command(Game *g, const char *command);
 void game_load_rooms(Game *g);
 void game_run_until_close(Game *g);
diff --git a/01_text_adventure/main.c b/01_text_adventure/main.c
index daffa3b..a48cd06 100644
--- a/01_text_adventure/main.c
+++ b/01_text_adventure/main.c
@@ -22,33 +22,6 @@ int main(void) {
     game_load_flags(g);
     game_load_actions(g);
 
-    for (int i = 0; i < g->actions->count; i++) {
-      for (int j = 0; j < g->actions->actions[i].words_count; j++) {
-	printf("%s ", g->actions->actions[i].words[j]->word);
-      }
-
-      printf("|");
-      for (int j = 0; j < g->actions->actions[i].predicates_count; j++) {
-	if (j > 0) printf(" & ");
-	print_predicate(g->actions->actions[i].predicates[j]);
-      }
-
-      printf("|%d|%s|", g->actions->actions[i].priority, g->actions->actions[i].description);
-
-      for (int j = 0; j < g->actions->actions[i].effects_count; j++) {
-	if (j > 0) printf(" & ");
-	print_effect(g->actions->actions[i].effects[j]);
-      }
-
-      printf("\n");
-    }
-
-    printf("before action\n");
-    printf("lever_pulled: %d\n", flag_value(g->flags, "LEVER_PULLED"));
-    cause_effect(g, g->actions->actions[2].effects[0]);
-    printf("after action\n");
-    printf("lever_pulled: %d\n", flag_value(g->flags, "LEVER_PULLED"));
-
     game_run_until_close(g);
     CloseWindow();
 
diff --git a/01_text_adventure/transition.c b/01_text_adventure/transition.c
index 7350d7a..7fccd79 100644
--- a/01_text_adventure/transition.c
+++ b/01_text_adventure/transition.c
@@ -27,7 +27,7 @@ void game_load_transitions(Game *g) {
   parse_multiline_string(g, data_transitions_txt, &load_transition);
 }
 
-Transition *find_transition(Transitions *t, Room *from, Command via) {
+Transition *find_transition(Transitions *t, Room *from, CommandType via) {
   for (int i = 0; i < t->count; i++) {
     Transition *candidate = &t->transitions[i];
     if (candidate->from == from && candidate->via == via) return candidate;
diff --git a/01_text_adventure/transition.h b/01_text_adventure/transition.h
index f92d5f0..4accf45 100644
--- a/01_text_adventure/transition.h
+++ b/01_text_adventure/transition.h
@@ -9,7 +9,7 @@ typedef struct Transitions Transitions;
 
 struct Transition {
   Room *from;
-  Command via;
+  CommandType via;
   Room *to;
   char *description;
 };
@@ -20,6 +20,6 @@ struct Transitions {
 };
 
 void game_load_transitions(Game *g);
-Transition *find_transition(Transitions *t, Room *from, Command via);
+Transition *find_transition(Transitions *t, Room *from, CommandType via);
 
 #endif
diff --git a/01_text_adventure/word.h b/01_text_adventure/word.h
index eabce58..23251e4 100644
--- a/01_text_adventure/word.h
+++ b/01_text_adventure/word.h
@@ -2,6 +2,7 @@
 #define _FD_WORD_
 typedef struct Word Word;
 typedef struct Words Words;
+typedef struct Words Words;
 
 #include "game.h"