X-Git-Url: https://plomlompom.com/repos/do_todos?a=blobdiff_plain;f=src%2Fmain.c;h=8c1ac5667dde5a1b33da92a8425888c4bbf36c72;hb=c7cdbe6260e5cd6a8efe2c73a02c9635b67ec4b7;hp=80e7b011c97ffc0ad2f8a55a8a88be97b7c54a60;hpb=7815e738f77aad4e918c84a89aa21f7ae683ebab;p=plomrogue

diff --git a/src/main.c b/src/main.c
index 80e7b01..8c1ac56 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,8 +18,7 @@
                         */
 #include "map_objects.h" /* for structs Monster, Item, Player,
                           * init_map_object_defs(), read_map_objects(),
-                          * read_map_objects_monsterdata,
-                          * read_map_objects_itemdata, build_map_objects()
+                          * build_map_objects()
                           */
 #include "map_object_actions.h" /* for player_wait(), move_player() */
 #include "map.h" /* for struct Map, init_map() */
@@ -72,9 +71,8 @@ int main(int argc, char *argv[])
         player.pos.y = read_uint16_bigendian(file) - 1;
         player.pos.x = read_uint16_bigendian(file) - 1;
         player.hitpoints = fgetc(file);
-        read_map_objects(&world.monster, file, sizeof(struct Monster),
-                          read_map_objects_monsterdata);
-        read_map_objects(&world.item,    file, sizeof(struct Item), NULL);
+        read_map_objects(&world, &world.monster, file);
+        read_map_objects(&world, &world.item,    file);
         fclose(file);
     }
 
@@ -109,21 +107,12 @@ int main(int argc, char *argv[])
     if (1 == world.turn)
     {
         player.pos = find_passable_pos(&map);
-        void * foo = build_map_objects(&world, &world.monster,
-                                       0, 1 + rrand() % 27,
-                                       sizeof(struct Monster),
-                                       build_map_objects_monsterdata);
-        foo = build_map_objects(&world, foo, 1, 1 + rrand() % 9,
-                                sizeof(struct Monster),
-                                build_map_objects_monsterdata);
-        build_map_objects(&world, foo, 2, 1 + rrand() % 3,
-                          sizeof(struct Monster),
-                          build_map_objects_monsterdata);
-        foo = build_map_objects(&world, &world.item, 3, 1 + rrand() % 3,
-                                sizeof(struct Item),
-                                build_map_objects_itemdata);
-        build_map_objects(&world, foo, 4, 1 + rrand() % 3,
-                          sizeof(struct Item), build_map_objects_itemdata);
+        void * foo;
+        foo = build_map_objects(&world, &world.monster, 1, 1 + rrand() % 27);
+        foo = build_map_objects(&world, foo, 2, 1 + rrand() % 9);
+        build_map_objects(&world, foo, 3, 1 + rrand() % 3);
+        foo = build_map_objects(&world, &world.item, 4, 1 + rrand() % 3);
+        build_map_objects(&world, foo, 5, 1 + rrand() % 3);
     }
 
     /* Initialize window system and windows. */
@@ -134,9 +123,12 @@ int main(int argc, char *argv[])
     raw();
     init_keybindings(&world);
     struct WinMeta win_meta = init_win_meta(screen);
-    struct Win win_keys = init_win(&win_meta, "Keys", 0, 29, &world, draw_keys_win);
-    struct Win win_info = init_win(&win_meta, "Info", 2, 20, &world, draw_info_win);
-    uint16_t height_logwin  = win_meta.padframe.size.y - (2 + win_info.frame.size.y);
+    struct Win win_keys = init_win(&win_meta, "Keys",
+                                   0, 29, &world, draw_keys_win);
+    struct Win win_info = init_win(&win_meta, "Info",
+                                   2, 20, &world, draw_info_win);
+    uint16_t height_logwin = win_meta.padframe.size.y
+                             - (2 + win_info.frame.size.y);
     struct Win win_log = init_win(&win_meta, "Log",
                                   height_logwin, 20, &world, draw_log_win);
     uint16_t width_mapwin = win_meta.padframe.size.x - win_keys.frame.size.x