X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fio.c;h=b18ad5da6123bb2136e78c3d811ca122d8dd59b1;hb=5f49de1262f21edd1911fe1df8ccb214acfa208c;hp=ee4dcc2151a7a2ce87792a61a502ab03e6f47b11;hpb=030c92e213af6bd6f01fb0a0683fea9a6feacb65;p=plomrogue
diff --git a/src/client/io.c b/src/client/io.c
index ee4dcc2..b18ad5d 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;
@@ -206,25 +211,26 @@ 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;
+ uint8_t wait = 15;
if (read_file_into_queue(world.file_server_out, &world.queue))
{
last_server_answer_time = time(0);
return;
}
time_t now = time(0);
- if (ping_sent && last_server_answer_time > now - 5) /* Re-set if last */
+ if (ping_sent && last_server_answer_time > now - wait)/* Re-set if last */
{ /* ping was answered */
ping_sent = 0; /* with server */
return; /* activity. */
}
- if (!ping_sent && last_server_answer_time < now - 5)
+ if (!ping_sent && last_server_answer_time < now - wait)
{
send("PING");
ping_sent = 1;
last_pong_time = now;
return;
}
- exit_err(ping_sent && last_pong_time < now - 5, "Server not answering.");
+ exit_err(ping_sent && last_pong_time < now - wait, "Server not answering.");
}
@@ -275,6 +281,7 @@ static uint8_t read_queue()
{
nl_append_string("(none known)", &world.things_here);
}
+ world.things_here_scroll = 0; //
}
else if (things_here_parsing)
{