X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=27a0e0f46d623fc2b31be94c074a2c953d61becb;hb=0907037fc188c28471805286a67b786264ba3e2f;hp=2b1c165eb0435c78a37737e94f5250d3361820c3;hpb=f9c94db47aa883149aa762fa128ac1ff1b3f92e1;p=plomrogue diff --git a/src/client/io.c b/src/client/io.c index 2b1c165..27a0e0f 100644 --- a/src/client/io.c +++ b/src/client/io.c @@ -15,7 +15,7 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "../common/rexit.h" /* exit_trouble(), exit_err() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(), - * try_fgetc() + * try_fgetc(), textfile_width() */ #include "control.h" /* try_key() */ #include "map.h" /* map_center() */ @@ -110,7 +110,7 @@ static void read_map_cells(FILE * file) char * f_name = "read_map_cells()"; free(world.map.cells); world.map.cells = try_malloc(world.map.size.y * world.map.size.x, f_name); - uint8_t y, x; + uint16_t y, x; for (y = 0; y < world.map.size.y; y++) { for (x = 0; x < world.map.size.x; x++) @@ -193,10 +193,9 @@ static uint8_t read_world() { return 0; } - uint32_t linemax = textfile_sizes(file, NULL); + uint32_t linemax = textfile_width(file); char * read_buf = try_malloc(linemax + 1, f_name); world.turn = read_value_from_line(read_buf, linemax, file); - world.player_score = read_value_from_line(read_buf, linemax, file); world.player_lifepoints = 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);