X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmain.c;h=3d6c0d38f5054db6dcac826b2c871a4ac02841cc;hb=00a66e3c7cbcad13b5c29162e6c1c33235be9f07;hp=4dd1673bcf897f543a04a07fccb45d4def917699;hpb=d951e2631a19500f1bb8c29f9e029a9d9fb29ae7;p=plomrogue

diff --git a/src/main.c b/src/main.c
index 4dd1673..3d6c0d3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,7 +7,8 @@
 #include "draw_wins.h"
 #include "keybindings.h"
 #include "readwrite.h"
-#include "objects_on_map.h"
+#include "map_objects.h"
+#include "map_object_actions.h"
 #include "map.h"
 #include "misc.h"
 
@@ -37,6 +38,34 @@ int main (int argc, char *argv[]) {
   world.player = &player;
   world.monster = 0;
   world.item = 0;
+  struct MonsterDef monster_def_A;
+  monster_def_A.map_obj_def.id = 1;
+  monster_def_A.map_obj_def.mapchar = 'a';
+  monster_def_A.map_obj_def.desc = "ANT";
+  monster_def_A.hitpoints_start = 1;
+  struct MonsterDef monster_def_B;
+  monster_def_B.map_obj_def.id = 2;
+  monster_def_B.map_obj_def.mapchar = 'z';
+  monster_def_B.map_obj_def.desc = "ZOMBIE";
+  monster_def_B.hitpoints_start = 3;
+  struct MonsterDef monster_def_C;
+  monster_def_C.map_obj_def.id = 3;
+  monster_def_C.map_obj_def.mapchar = 'S';
+  monster_def_C.map_obj_def.desc = "SHOGGOTH";
+  monster_def_C.hitpoints_start = 9;
+  world.monster_def = &monster_def_A;
+  monster_def_A.map_obj_def.next = (struct MapObjDef *) &monster_def_B;
+  monster_def_B.map_obj_def.next = (struct MapObjDef *) &monster_def_C;
+  monster_def_C.map_obj_def.next = NULL;
+  struct ItemDef item_def_A;
+  item_def_A.map_obj_def.id = 4;
+  item_def_A.map_obj_def.mapchar = '#';
+  struct ItemDef item_def_B;
+  item_def_B.map_obj_def.id = 5;
+  item_def_B.map_obj_def.mapchar = '%';
+  world.item_def = &item_def_A;
+  item_def_A.map_obj_def.next = (struct MapObjDef *) &item_def_B;
+  item_def_B.map_obj_def.next = NULL;
 
   // For interactive mode, try to load world state from savefile.
   FILE * file;
@@ -71,10 +100,15 @@ int main (int argc, char *argv[]) {
   world.map = ↦
   if (1 == world.turn) {
     player.pos = find_passable_pos(&map);
-    unsigned char n_monsters = rrand(0, 0) % 16;
-    unsigned char n_items    = rrand(0, 0) % 48;
-    build_map_objects (&world.monster, n_monsters, sizeof(struct Monster), build_map_objects_monsterdata, &map);
-    build_map_objects (&world.item,    n_items,    sizeof(struct Item),    build_map_objects_itemdata,    &map); }
+    void * foo = build_map_objects (&world, &world.monster, 1, 1 + rrand(0,0) % 27, sizeof(struct Monster),
+                                    build_map_objects_monsterdata);
+    foo = build_map_objects (&world, foo, 2, 1 + rrand(0,0) % 9, sizeof(struct Monster),
+                             build_map_objects_monsterdata);
+    build_map_objects (&world, foo, 3, 1 + rrand(0,0) % 3, sizeof(struct Monster),
+                       build_map_objects_monsterdata);
+    foo = build_map_objects (&world, &world.item, 4, 1 + rrand(0,0) % 3, sizeof(struct Item),
+                             build_map_objects_itemdata);
+    build_map_objects (&world, foo, 5, 1 + rrand(0,0) % 3, sizeof(struct Item), build_map_objects_itemdata); }
 
   // Initialize window system and windows.
   WINDOW * screen = initscr();