Refactored code for loading/saving positions of monsters and items, is a bit more...

[plomrogue] / src / roguelike.c

diff --git a/src/roguelike.c b/src/roguelike.c
index ce3f5a45e1629280c86af59b1cf169caf5fbb52a..c5365a1d4aa5ee35e473dbc2b83a0452742c2b1b 100644 (file)
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -96,12 +96,14 @@ void save_game(struct World * world) {
   write_uint32_bigendian(world->turn, file);
   write_uint16_bigendian(world->player->pos.y, file);
   write_uint16_bigendian(world->player->pos.x, file);
-  write_uint16_bigendian(world->monster->pos.y, file);
-  write_uint16_bigendian(world->monster->pos.x, file);
-  write_uint16_bigendian(world->monster->next->pos.y, file);
-  write_uint16_bigendian(world->monster->next->pos.x, file);
-  write_uint16_bigendian(world->monster->next->next->pos.y, file);
-  write_uint16_bigendian(world->monster->next->next->pos.x, file);
+  struct Monster * monster;
+  for (monster = world->monster; monster != 0; monster = monster->next) {
+    write_uint16_bigendian(monster->pos.y, file);
+    write_uint16_bigendian(monster->pos.x, file); }
+  struct Item * item;
+  for (item = world->item; item != 0; item = item->next) {
+    write_uint16_bigendian(item->pos.y, file);
+    write_uint16_bigendian(item->pos.x, file); }
   fclose(file); }
 
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
@@ -197,7 +199,7 @@ int main (int argc, char *argv[]) {
       default:
         exit(EXIT_FAILURE); } }
 
-  // Initialize log, player and monsters.
+  // Initialize log, player, monsters and items.
   world.log = calloc(1, sizeof(char));
   update_log (&world, " ");
   struct Player player;
@@ -212,21 +214,33 @@ int main (int argc, char *argv[]) {
   monster1.name = 'A';
   monster2.name = 'B';
   monster3.name = 'C';
+  struct Item item1;
+  struct Item item2;
+  struct Item item3;
+  world.item = &item1;
+  item1.next = &item2;
+  item2.next = &item3;
+  item3.next = 0;
+  item1.name = '&';
+  item2.name = '%';
+  item3.name = '#';
 
   // For interactive mode, try to load world state from savefile.
   FILE * file;
+  struct Item * item;
+  struct Monster * monster;
   if (1 == world.interactive && 0 == access("savefile", F_OK)) {
     file = fopen("savefile", "r");
     world.seed = read_uint32_bigendian(file);
     world.turn = read_uint32_bigendian(file);
     player.pos.y = read_uint16_bigendian(file);
     player.pos.x = read_uint16_bigendian(file);
-    monster1.pos.y = read_uint16_bigendian(file);
-    monster1.pos.x = read_uint16_bigendian(file);
-    monster2.pos.y = read_uint16_bigendian(file);
-    monster2.pos.x = read_uint16_bigendian(file);
-    monster3.pos.y = read_uint16_bigendian(file);
-    monster3.pos.x = read_uint16_bigendian(file);
+    for (monster = world.monster; monster != 0; monster = monster->next) {
+      monster->pos.y = read_uint16_bigendian(file);
+      monster->pos.x = read_uint16_bigendian(file); }
+    for (item = world.item; item != 0; item = item->next) {
+      item->pos.y = read_uint16_bigendian(file);
+      item->pos.x = read_uint16_bigendian(file); }
     fclose(file); }
 
   // For non-interactive mode, try to load world state from frecord file.
@@ -251,7 +265,10 @@ int main (int argc, char *argv[]) {
     for (player.pos.y = player.pos.x = 0; 0 == is_passable(&map, player.pos);) {
       player.pos.y = rrand(0, 0) % map.size.y;
       player.pos.x = rrand(0, 0) % map.size.x; }
-    struct Monster * monster;
+    for (item = world.item; item != 0; item = item->next)
+      for (item->pos.y = item->pos.x = 0; 0 == is_passable(&map, item->pos);) {
+        item->pos.y = rrand(0, 0) % map.size.y;
+        item->pos.x = rrand(0, 0) % map.size.x; }
     for (monster = world.monster; monster != 0; monster = monster->next)
       for (monster->pos.y = monster->pos.x = 0; 0 == is_passable(&map, monster->pos);) {
         monster->pos.y = rrand(0, 0) % map.size.y;