X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=7fbb511055b2e30842a24b713bcfb5502dbf42ae;hb=bfd1888150ed5345fb4552ccaa8f304ae4819980;hp=079a8339c6bd3ac28d8a8932f3f952b0a4a7fec0;hpb=784a54c9ef27aa2bf0754b2761aee06cbbde270e;p=plomrogue diff --git a/src/server/io.c b/src/server/io.c index 079a833..7fbb511 100644 --- a/src/server/io.c +++ b/src/server/io.c @@ -1,25 +1,23 @@ /* src/server/io.c */ +#define _POSIX_C_SOURCE 199309L #include "io.h" #include /* global errno */ #include /* PIPE_BUF */ #include /* size_t, NULL */ -#include /* uint8_t, uint32_t */ -#include /* defines EOF, FILE, sprintf(), ungetc() */ -#include /* free(), atoi() */ -#include /* strlen(), memcpy() */ +#include /* uint8_t, uint16_t, uint32_t */ +#include /* defines EOF, FILE, sprintf() */ +#include /* free() */ +#include /* strlen(), memcpy(), memset() */ #include /* time_t */ -#include /* time() */ -#include "../common/err_try_fgets.h" /* err_try_fgets(), err_line(), - * reset_err_try_fgets_counter() - */ +#include /* time(), nanosleep() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(), - * try_fwrite(), try_fputc(), try_fgetc(), - * try_fclose() + * try_fwrite(), try_fputc(), try_fgetc() */ -#include "../common/rexit.h" /* exit_trouble() */ #include "../common/try_malloc.h" /* try_malloc() */ -#include "cleanup.h" /* set_cleanup_flag(), enum cleanup_flag */ +#include "cleanup.h" /* set_cleanup_flag() */ +#include "field_of_view.h" /* VISIBLE, build_fov_map() */ +#include "map.h" /* yx_to_map_pos() */ #include "map_objects.h" /* structs MapObj, MapObjDef, get_map_obj_def() */ #include "world.h" /* global world */ @@ -32,8 +30,8 @@ */ static char * get_message_from_queue(); -/* Read input file for input into world.queue. new queue input. Wait a few - * seconds until giving up. Translate '\n' chars in input file into '\0' chars. +/* Poll input file for world.queue input. Wait a few seconds until giving up; + * poll only every 0.03 seconds.. Translate '\n' chars in input file into '\0'. */ static void read_file_into_queue(); @@ -48,10 +46,15 @@ static void write_value_as_line(uint32_t value, FILE * file); /* Write to "file" player's inventory, one item name per line. End in "%\n". */ static void write_inventory(struct MapObj * player, FILE * file); -/* Write to "file" game map, with map objects super-imposed. Write one row per - * \n-delimited line. Super-impose animated objects over inanimate objects. +/* Return map cells sequence as visible to the "player", with invisible cells as + * whitespace. Super-impose over visible map cells map objects positioned there. */ -static void write_map(FILE * file); +static char * build_visible_map(struct MapObj * player); + +/* Write to "file" game map as visible to "player", build_visible_map()-drawn. + * Write one row per \n-delimited line. + */ +static void write_map(struct MapObj * player, FILE * file); @@ -95,9 +98,13 @@ static void read_file_into_queue() char * f_name = "read_file_into_queue()"; uint8_t wait_seconds = 5; time_t now = time(0); + struct timespec dur; + dur.tv_sec = 0; + dur.tv_nsec = 33333333; int test; while (EOF == (test = try_fgetc(world.file_in, f_name))) { + nanosleep(&dur, NULL); if (time(0) > now + wait_seconds) { return; @@ -137,7 +144,7 @@ static void update_worldstate_file() write_value_as_line(player->pos.x, file); write_value_as_line(world.map.size.y, file); write_value_as_line(world.map.size.x, file); - write_map(file); + write_map(player, file); if (world.log) { try_fwrite(world.log, strlen(world.log), 1, file, f_name); @@ -187,12 +194,21 @@ static void write_inventory(struct MapObj * player, FILE * file) -static void write_map(FILE * file) +static char * build_visible_map(struct MapObj * player) { - char * f_name = "write_map()"; + char * f_name = "build_visible_map()"; + uint8_t * fov_map = build_fov_map(player); uint32_t map_size = world.map.size.y * world.map.size.x; - char visible_map[map_size]; - memcpy(visible_map, world.map.cells, map_size); + char * visible_map = try_malloc(map_size, f_name); + memset(visible_map, ' ', map_size); + uint16_t pos_i; + for (pos_i = 0; pos_i < map_size; pos_i++) + { + if (fov_map[pos_i] & VISIBLE) + { + visible_map[pos_i] = world.map.cells[pos_i]; + } + } struct MapObj * o; struct MapObjDef * d; char c; @@ -201,67 +217,36 @@ static void write_map(FILE * file) { for (o = world.map_objs; o != 0; o = o->next) { - if (( (0 == i && 0 == o->lifepoints) - || (1 == i && 0 < o->lifepoints))) + if ( fov_map[yx_to_map_pos(&o->pos)] & VISIBLE + && ( (0 == i && 0 == o->lifepoints) + || (1 == i && 0 < o->lifepoints))) { d = get_map_object_def(o->type); c = d->char_on_map; - visible_map[(o->pos.y * world.map.size.x) + o->pos.x] = c; + visible_map[yx_to_map_pos(&o->pos)] = c; } } } - uint16_t x, y; - for (y = 0; y < world.map.size.y; y++) - { - for (x = 0; x < world.map.size.x; x++) - { - try_fputc(visible_map[(y * world.map.size.x) + x], file, f_name); - } - try_fputc('\n', file, f_name); - } + free(fov_map); + return visible_map; } -extern void read_config_file(char * path, enum cleanup_flag cleanup, - size_t size, struct EntrySkeleton ** entry_start, - void (* read) (char *, uint32_t, char *, - struct EntrySkeleton *, FILE *)) +static void write_map(struct MapObj * player, FILE * file) { - char * f_name = "init_map_object_defs()"; - char * context_prefix = "Failed reading config file: "; - char context[strlen(context_prefix) + strlen(path) + 1]; - sprintf(context, "%s%s", context_prefix, path); - char * err_uniq = "Declaration of ID already used."; - FILE * file = try_fopen(path, "r", f_name); - uint32_t linemax = textfile_width(file); - char line[linemax + 1]; - reset_err_try_fgets_counter(); - struct EntrySkeleton ** entry_ptr_ptr = entry_start; - while (1) + char * f_name = "write_map()"; + char * visible_map = build_visible_map(player); + uint16_t x, y; + for (y = 0; y < world.map.size.y; y++) { - int test_for_end = try_fgetc(file, f_name); - if (EOF == test_for_end || '\n' == test_for_end) - { - break; - } - exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()"); - err_try_fgets(line, linemax, file, context, "nfi8"); - struct EntrySkeleton * entry = try_malloc(size, f_name); - entry->id = atoi(line); - struct EntrySkeleton * entry_test = * entry_start; - for (; NULL != entry_test; entry_test = entry_test->next) + for (x = 0; x < world.map.size.x; x++) { - err_line(entry->id == entry_test->id, line, context, err_uniq); + try_fputc(visible_map[(y * world.map.size.x) + x], file, f_name); } - read(line, linemax, context, entry, file); - entry->next = NULL; - * entry_ptr_ptr = entry; - entry_ptr_ptr = &entry->next; - err_try_fgets(line, linemax, file, context, "d"); + try_fputc('\n', file, f_name); } - try_fclose(file, f_name); - set_cleanup_flag(cleanup); + free(visible_map); }