X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=247a681c9f3a683178ef39693562b4b644824aa4;hb=07b41b8fbdfbe03791774bfcc0b4fefb1cc2b4d3;hp=d1fffc05296d930f39dce3187492191ac231d134;hpb=5efc409a3640bcc8b2b4d5310a7e09c1e22afeba;p=plomrogue
diff --git a/src/client/io.c b/src/client/io.c
index d1fffc0..247a681 100644
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -8,7 +8,7 @@
#define _POSIX_C_SOURCE 1 /* PIPE_BUF */
#include "io.h"
#include /* PIPE_BUF */
-#include /* halfdelay(), getch() */
+#include /* timeout(), getch() */
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
#include /* FILE, sprintf(), fseek(), fflush() */
@@ -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,12 +184,17 @@ 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.godsmood = (int16_t) read_value_from_line(read_buf, linemax, file); //
+ world.godsfavor = (int16_t) read_value_from_line(read_buf, linemax, file); //
+ world.turn = (uint16_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);
free(read_buf);
@@ -204,6 +207,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))
{
@@ -211,18 +215,19 @@ static void test_and_poll_server()
return;
}
time_t now = time(0);
- if (ping_sent && last_server_answer_time > now - 3) /* Re-set if last */
+ if (ping_sent && last_server_answer_time > now - 5) /* Re-set if last */
{ /* ping was answered */
ping_sent = 0; /* with server */
return; /* activity. */
}
- if (!ping_sent && last_server_answer_time < now - 3)
+ if (!ping_sent && last_server_answer_time < now - 5)
{
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.");
}
@@ -315,11 +320,12 @@ extern void send(char * msg)
extern char * io_loop()
{
- world.halfdelay = 1; /* Ensure server is polled only 10 times */
- halfdelay(world.halfdelay); /* a second during user inactivity. */
+ uint16_t delay = 1; /* Greater delay: less redundant server files reading.*/
uint8_t change_in_client = 0;
while (1)
{
+ timeout(delay);
+ delay = delay < 1000 ? delay * 2 : delay;
test_and_poll_server();
if (world.winch)
{
@@ -329,16 +335,21 @@ extern char * io_loop()
}
if (change_in_client || read_worldstate() || read_queue())
{
+ delay = 1; /* Keep client alert even if it's not getch()'d. */
struct Win * win_map = get_win_by_id('m');
- struct yx_uint8 pos = world.look? world.look_pos : world.player_pos;
- win_map->center.y = pos.y;
- win_map->center.x = pos.x * 2 + (pos.y % 2);
+ if (0 == win_map->view) /* So the map window's winconfig views */
+ { /* don't get confused by the centering. */
+ struct yx_uint8 pos=world.look?world.look_pos:world.player_pos;
+ win_map->center.y = pos.y;
+ win_map->center.x = pos.x * 2 + (pos.y % 2);
+ }
draw_all_wins();
}
change_in_client = 0;
int key = getch();
if (ERR != key)
{
+ delay = 1; /* Alert client if it's getch()'d. */
change_in_client = try_key((uint16_t) key);
if (2 == change_in_client)
{