Started implementing items. They don't do much but lie around on the map.

[plomrogue] / src / roguelike.c

diff --git a/src/roguelike.c b/src/roguelike.c
index d21238852ce7b189b725b4d24a25873830e70b92..37e90c96ac8b766849de77895d1d4e91b3807cba 100644 (file)
--- a/src/roguelike.c
+++ b/src/roguelike.c
@@ -20,14 +20,25 @@ uint16_t rrand(char use_seed, uint32_t new_seed) {
   return (seed / 65536); }                         // Ignore least significant 16 bits (they are less random).
 
 void update_log (struct World * world, char * text) {
-// Update log with new text to be appended.
+// Update log by appending text, or by appending a "." if text is the same as the last one.
+  static char * last_msg;
+  if (0 == last_msg)
+    last_msg = calloc(1, sizeof(char));
   char * new_text;
   uint16_t len_old = strlen(world->log);
-  uint16_t len_new = strlen(text);
-  uint16_t len_whole = len_old + len_new + 1;
-  new_text = calloc(len_whole, sizeof(char));
-  memcpy(new_text, world->log, len_old);
-  memcpy(new_text + len_old, text, len_new);
+  if (0 == strcmp(last_msg, text)) {
+    uint16_t len_whole = len_old + 1;
+    new_text = calloc(len_whole + 1, sizeof(char));
+    memcpy(new_text, world->log, len_old);
+    memcpy(new_text + len_old, ".", 1); }
+  else {
+    uint16_t len_new = strlen(text);
+    uint16_t len_whole = len_old + len_new + 1;
+    new_text = calloc(len_whole, sizeof(char));
+    memcpy(new_text, world->log, len_old);
+    memcpy(new_text + len_old, text, len_new);
+    last_msg = calloc(len_new + 1, sizeof(char));
+    memcpy(last_msg, text, len_new); }
   free(world->log);
   world->log = new_text; }
 
@@ -91,6 +102,12 @@ void save_game(struct World * world) {
   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);
+  write_uint16_bigendian(world->item->pos.y, file);
+  write_uint16_bigendian(world->item->pos.x, file);
+  write_uint16_bigendian(world->item->next->pos.y, file);
+  write_uint16_bigendian(world->item->next->pos.x, file);
+  write_uint16_bigendian(world->item->next->next->pos.y, file);
+  write_uint16_bigendian(world->item->next->next->pos.x, file);
   fclose(file); }
 
 void toggle_window (struct WinMeta * win_meta, struct Win * win) {
@@ -186,7 +203,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;
@@ -201,6 +218,16 @@ 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;
@@ -216,6 +243,12 @@ int main (int argc, char *argv[]) {
     monster2.pos.x = read_uint16_bigendian(file);
     monster3.pos.y = read_uint16_bigendian(file);
     monster3.pos.x = read_uint16_bigendian(file);
+    item1.pos.y = read_uint16_bigendian(file);
+    item1.pos.x = read_uint16_bigendian(file);
+    item2.pos.y = read_uint16_bigendian(file);
+    item2.pos.x = read_uint16_bigendian(file);
+    item3.pos.y = read_uint16_bigendian(file);
+    item3.pos.x = read_uint16_bigendian(file);
     fclose(file); }
 
   // For non-interactive mode, try to load world state from frecord file.
@@ -240,6 +273,11 @@ 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 Item * item;
+    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; }
     struct Monster * monster;
     for (monster = world.monster; monster != 0; monster = monster->next)
       for (monster->pos.y = monster->pos.x = 0; 0 == is_passable(&map, monster->pos);) {