X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fmain.c;h=71a5370e05d83e86c0524721d2c6fc95bd8c2bb0;hb=9d35a239f47714198b942deca3171334409a27bb;hp=fcaac80e3556d1b6e0912775a67f7ddfd4f563cc;hpb=fb8ddca6abc66eb7e52a007850689309b4cda938;p=plomrogue
diff --git a/src/main.c b/src/main.c
index fcaac80..71a5370 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,10 +7,12 @@
#include /* for time() */
#include /* for getopt(), optarg */
#include /* for uint32_t */
-#include "windows.h" /* for structs WinMeta, Win, init_win_meta(), draw_all_wins()
+#include "windows.h" /* for structs WinMeta, Win, init_win_meta(),
+ * draw_all_wins()
*/
-#include "readwrite.h" /* for read_uint32_bigendian](), write_uint32_bigendian(),
- * try_fopen(), try_fclose(), try_fclose_unlink_rename()
+#include "readwrite.h" /* for read_uint32_bigendian](),
+ * write_uint32_bigendian(), try_fopen(), try_fclose(),
+ * try_fclose_unlink_rename()
*/
#include "map_objects.h" /* for structs MapObj Player, init_map_object_defs(),
* build_map_objects()
@@ -136,12 +138,12 @@ int main(int argc, char *argv[])
if (0 == world.turn)
{
player.pos = find_passable_pos(world.map);
- struct MapObj ** ptr;
- ptr = build_map_objects(&world, &world.map_objs, 1, 1 + rrand() % 27);
- ptr = build_map_objects(&world, ptr, 2, 1 + rrand() % 9);
- ptr = build_map_objects(&world, ptr, 3, 1 + rrand() % 3);
- ptr = build_map_objects(&world, ptr, 4, 1 + rrand() % 3);
- ptr = build_map_objects(&world, ptr, 5, 1 + rrand() % 3);
+ world.map_objs = NULL;
+ add_map_objects(&world, 1, 1 + rrand() % 27);
+ add_map_objects(&world, 2, 1 + rrand() % 9);
+ add_map_objects(&world, 3, 1 + rrand() % 3);
+ add_map_objects(&world, 4, 1 + rrand() % 3);
+ add_map_objects(&world, 5, 1 + rrand() % 3);
set_cleanup_flag(CLEANUP_MAP_OBJECTS);
world.turn = 1;
}