X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fio.c;h=d7d145065d918f1fe6c6fb8826af8077700344a7;hb=2fcc592d683e89a24d69db391c8ccd842be0d542;hp=694ebfbfc43d2214842b5e14b1e722afb990b41a;hpb=2b514e7114696bca61891f4a6d6576d002f47c0b;p=plomrogue

diff --git a/src/client/io.c b/src/client/io.c
index 694ebfb..d7d1450 100644
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -49,8 +49,7 @@ static void read_map_cells(FILE * file, char ** map);
 /* Return value seen by atoi() in next line of "file" when passed to try_fgets()
  * with the given arguments.
  */
-static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
-                                     FILE * file);
+static int32_t read_value_from_line(char* read_buf,int32_t linemax,FILE* file);
 
 /* If the server's worldstate file has changed since the last read_worldstate(),
  * return a pointer to its file descriptor; else, return NULL.
@@ -142,8 +141,7 @@ static void read_map_cells(FILE * file, char ** map)
 
 
 
-static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
-                                     FILE * file)
+static int32_t read_value_from_line(char * read_buf,int32_t linemax,FILE * file)
 {
     try_fgets(read_buf, linemax + 1, file, __func__);
     return atoi(read_buf);
@@ -186,14 +184,21 @@ static uint8_t read_worldstate()
     }
     uint32_t linemax = textfile_width(file);
     char * read_buf = try_malloc(linemax + 1, __func__);
-    world.turn = read_value_from_line(read_buf, linemax, file);
-    world.player_lifepoints = read_value_from_line(read_buf, linemax, file);
+    world.turn = (uint16_t) read_value_from_line(read_buf, linemax, file);
+    world.godsmood = (int16_t) read_value_from_line(read_buf, linemax, file); //
+    world.godsfavor = (int16_t) read_value_from_line(read_buf, linemax, file); //
+    world.player_lifepoints = (uint16_t) read_value_from_line(read_buf, linemax,
+                                                              file);
+    world.player_satiation = (int16_t) read_value_from_line(read_buf, linemax,
+                                                            file);
     read_inventory(read_buf, linemax, file);
-    world.player_pos.y = read_value_from_line(read_buf, linemax, file);
-    world.player_pos.x = read_value_from_line(read_buf, linemax, file);
-    world.map.length = read_value_from_line(read_buf, linemax, file);
+    world.player_pos.y = (uint8_t) read_value_from_line(read_buf,linemax,file);
+    world.player_pos.x = (uint8_t) read_value_from_line(read_buf,linemax,file);
+    world.map.length = (uint16_t) read_value_from_line(read_buf, linemax, file);
     read_map_cells(file, &world.map.cells);
     read_map_cells(file, &world.mem_map);
+    read_map_cells(file, &world.meta_map_0);  //
+    read_map_cells(file, &world.meta_map_1);  //
     free(read_buf);
     try_fclose(file, __func__);
     return 1;
@@ -204,6 +209,7 @@ static uint8_t read_worldstate()
 static void test_and_poll_server()
 {
     static time_t last_server_answer_time = 0;
+    static time_t last_pong_time = 0;
     static uint8_t ping_sent = 0;
     if (read_file_into_queue(world.file_server_out, &world.queue))
     {
@@ -220,9 +226,10 @@ static void test_and_poll_server()
     {
         send("PING");
         ping_sent = 1;
+        last_pong_time = now;
         return;
     }
-    exit_err(last_server_answer_time < now - 6, "Server not answering.");
+    exit_err(ping_sent && last_pong_time < now - 5, "Server not answering.");
 }
 
 
@@ -273,6 +280,7 @@ static uint8_t read_queue()
             {
                 nl_append_string("(none known)", &world.things_here);
             }
+            world.things_here_scroll = 0;  //
         }
         else if (things_here_parsing)
         {