forward referencing refactoring and maybe implementation progress? :/

Author: saturnation

.idea/workspace.xml

@@ -5,8 +5,8 @@
 #include <stdlib.h>
 #include "fighter.h"
 
-fighter *create_fighter(int hp, int defense, int power) {
-    fighter *f = malloc(sizeof(fighter));
+struct fighter *create_fighter(int hp, int defense, int power) {
+    struct fighter *f = malloc(sizeof(struct fighter));
     f->hp = hp;
     f->defense = defense;
     f->power = power;

src/components/fighter.c

@@ -5,12 +5,13 @@
 #ifndef LIBTCOD_TUTORIAL_FIGHTER_H
 #define LIBTCOD_TUTORIAL_FIGHTER_H
 
-typedef struct {
+struct fighter{
     int max_hp;
     int hp;
     int defense;
     int power;
-} fighter;
+};
+;
 
-fighter *create_fighter(int hp, int defense, int power);
+struct fighter* create_fighter(int hp, int defense, int power);
 #endif //LIBTCOD_TUTORIAL_FIGHTER_H

src/components/fighter.h

@@ -3,10 +3,10 @@
 //
 #include "list.h"
 
-entity *get_blocking_entities_at_location(entity_list *e, int destination_x, int destination_y) {
-    entity_list *curr = e;
+struct entity *get_blocking_entities_at_location(struct entity_list *e, int destination_x, int destination_y) {
+    struct entity_list *curr = e;
     while (curr != NULL) {
-        entity curr_e = *curr->data;
+        struct entity curr_e = *curr->data;
         if (curr_e.blocks && curr_e.x == destination_x && curr_e.y == destination_y) {
             return curr->data;
         }

src/data/list.c

@@ -5,15 +5,16 @@
 #ifndef LIBTCOD_TUTORIAL_LIST_H
 #define LIBTCOD_TUTORIAL_LIST_H
 
-#include "../entity.h"
 
-struct node {
-    entity *data;
-    struct node *next;
+struct entity;
+
+struct entity_list {
+    struct entity *data;
+    struct entity_list *next;
 };
 
-typedef struct node entity_list;
+#include "../entity.h"
 
-entity *get_blocking_entities_at_location(entity_list *e, int destination_x, int destination_y);
+struct entity *get_blocking_entities_at_location(struct entity_list *e, int destination_x, int destination_y);
 
 #endif //LIBTCOD_TUTORIAL_LIST_H

src/data/list.h

@@ -6,20 +6,20 @@
 #include <stdio.h>
 #include "entity.h"
 
-void move(entity *e, int dx, int dy) {
+void move(struct entity *e, int dx, int dy) {
     e->x += dx;
     e->y += dy;
 }
 
-entity *create_entity(int x,
+struct entity *create_entity(int x,
                       int y,
                       char c,
                       TCOD_color_t color,
                       char *name,
                       bool blocks,
-                      fighter *fighter,
-                      void (*ai_action)(entity *)) {
-    entity *e = malloc(sizeof(entity));
+                      struct fighter *fighter,
+                      void (*ai_action)(struct entity *, struct entity *, TCOD_Map *, struct game_map *, struct entity_list *)) {
+    struct entity *e = malloc(sizeof(struct entity));
     e->x = x;
     e->y = y;
     e->c = c;
@@ -31,8 +31,3 @@ entity *create_entity(int x,
     return e;
 }
 
-void basic_ai_monster_turn(entity *e) {
-    printf("The %s wonders when it will get to move.\n", e->name);
-}
-
-

src/entity.c

@@ -6,31 +6,39 @@
 #define LIBTCOD_TUTORIAL_ENTITY_H
 
 #include <libtcod/color.h>
+#include <libtcod/fov_types.h>
 
-#include "components/fighter.h"
+struct game_map;
+struct entity_list;
 
-typedef struct entity {
+struct entity {
     int x;
     int y;
     char c;
     TCOD_color_t color;
     char *name;
     bool blocks;
-    fighter *fighter;
-    void (*ai_action)(struct entity *);
-} entity;
-
-entity *create_entity(int x,
-                      int y,
-                      char c,
-                      TCOD_color_t color,
-                      char *name,
-                      bool blocks,
-                      fighter *fighter,
-                      void(*ai_action)(entity *));
-
-void move(entity *e, int dx, int dy);
-
-void basic_ai_monster_turn(entity* e);
+    struct fighter *fighter;
+
+    void (*ai_action)(struct entity *, struct entity *, TCOD_Map *, struct game_map *, struct entity_list *);
+};
+
+#include "components/fighter.h"
+#include "map/game_map.h"
+#include "data/list.h"
+
+struct entity *create_entity(int x,
+                             int y,
+                             char c,
+                             TCOD_color_t color,
+                             char *name,
+                             bool blocks,
+                             struct fighter *fighter,
+                             void(*ai_action)(struct entity *,
+                                              struct entity *, TCOD_Map *,
+                                              struct game_map *,
+                                              struct entity_list *));
+
+void move(struct entity *e, int dx, int dy);
 
 #endif //LIBTCOD_TUTORIAL_ENTITY_H

src/entity.h

@@ -32,12 +32,12 @@ int main() {
     colors[LIGHT_WALL] = TCOD_color_RGB(130, 110, 50);
     colors[LIGHT_GROUND] = TCOD_color_RGB(200, 180, 50);
 
-    entity_list *entities_list_head;
-    entity_list *player;
-    entities_list_head = (entity_list *) malloc(sizeof(entity_list));
+    struct entity_list *entities_list_head;
+    struct entity_list *player;
+    entities_list_head = (struct entity_list *) malloc(sizeof(struct entity_list));
     entities_list_head->next = NULL;
     player = entities_list_head;
-    fighter *fighter = create_fighter(30, 2, 5);
+    struct fighter *fighter = create_fighter(30, 2, 5);
     player->data = create_entity(screen_width / 2, screen_height / 2, '@', TCOD_white, "Player", true, fighter, NULL);
     TCOD_console_set_custom_font("terminal16x16_gs_ro.png",
                                  TCOD_FONT_TYPE_GRAYSCALE | TCOD_FONT_LAYOUT_ASCII_INROW,
@@ -46,7 +46,7 @@ int main() {
     TCOD_console_init_root(screen_width, screen_height, "libtcod Tutorial", false, TCOD_RENDERER_SDL2);
     TCOD_console_t con = TCOD_console_new(screen_width, screen_height);
 
-    game_map *map = create_game_map(map_width, map_height);
+    struct game_map *map = create_game_map(map_width, map_height);
     make_map(map, max_rooms, room_min_size, room_max_size, map_width, map_height, player->data, entities_list_head,
              max_monsters_per_room);
 
@@ -94,7 +94,7 @@ int main() {
                 int destination_x = player->data->x + dx;
                 int destination_y = player->data->y + dy;
                 if (!is_blocked(map, destination_x, destination_y)) {
-                    entity *target = get_blocking_entities_at_location(entities_list_head, destination_x,
+                    struct entity *target = get_blocking_entities_at_location(entities_list_head, destination_x,
                                                                        destination_y);
                     if (target) {
                         printf("You kick the %s in the shins, much to its annoyance!\n", target->name);
@@ -111,10 +111,10 @@ int main() {
             }
 
             if (game_state == ENEMY_TURN) {
-                entity_list *curr = entities_list_head;
+                struct entity_list *curr = entities_list_head;
                 while (curr != NULL) {
                     if (curr->data->ai_action) {
-                        (*curr->data->ai_action)(curr->data);
+                        (*curr->data->ai_action)(curr->data, player->data, fov_map, map, entities_list_head);
                     }
                     curr = curr->next;
                 }

src/main.c

@@ -7,7 +7,7 @@
 #include "game_map.h"
 #include "tile.h"
 
-TCOD_Map* initialize_fov(game_map *map) {
+TCOD_Map* initialize_fov(struct game_map *map) {
     TCOD_Map *fov_map = TCOD_map_new(map->width, map->height);
     for (int y = 0; y < map->height; y++) {
         for (int x = 0; x < map->width; x++) {

src/map/fov.c

@@ -8,7 +8,7 @@
 #ifndef LIBTCOD_TUTORIAL_FOV_H
 #define LIBTCOD_TUTORIAL_FOV_H
 
-TCOD_Map* initialize_fov(game_map *map);
+TCOD_Map* initialize_fov(struct game_map *map);
 void recompute_fov(TCOD_Map* fov_map, int x, int y, int radius, bool light_walls, int algorithm);
 
 #endif //LIBTCOD_TUTORIAL_FOV_H