X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=70a010780c9a97ba866c3c88f8f296134e0fc7b0;hb=edebb2bf9aa780ee2f7006c1d2be9168564d34df;hp=7fbb511055b2e30842a24b713bcfb5502dbf42ae;hpb=639a12151eeb7ce0d18de330b4bb8d9d8094c4d3;p=plomrogue diff --git a/src/server/io.c b/src/server/io.c index 7fbb511..70a0107 100644 --- a/src/server/io.c +++ b/src/server/io.c @@ -5,24 +5,37 @@ #include /* global errno */ #include /* PIPE_BUF */ #include /* size_t, NULL */ -#include /* uint8_t, uint16_t, uint32_t */ -#include /* defines EOF, FILE, sprintf() */ +#include /* uint8_t, uint16_t, uint32_t, UINT8_MAX */ +#include /* defines EOF, FILE, sprintf(), fprintf() */ #include /* free() */ -#include /* strlen(), memcpy(), memset() */ +#include /* strlen(), snprintf(), memcpy(), memset(), strchr() */ #include /* time_t */ #include /* time(), nanosleep() */ -#include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(), +#include "../common/readwrite.h" /* atomic_write_start(), atomic_write_finish(), * 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() */ -#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 "field_of_view.h" /* VISIBLE */ +#include "hardcoded_strings.h" /* s */ +#include "things.h" /* Thing, ThingType, ThingAction, get_thing_type(), + * get_player() + */ #include "world.h" /* global world */ +/* Helpers to write lines of god commands to recreate thing "t". */ +static void write_key_space(FILE * file, char * key); +static void write_value(FILE * file, uint32_t value); +static void write_string(FILE * file, char * string); +static void write_key_space_value(FILE * file, char * key, uint32_t value); +static void write_key_space_string(FILE * file, char * key, char * string); + +/* Write to "file" \n-delimited line of "key" + space + "value" as string. */ +static void write_thing(FILE * file, struct Thing * t); + /* Cut out and return first \0-terminated string from world.queue and * appropriately reduce world.queue_size. Return NULL if queue is empty. * Superfluous \0 bytes after the string are also cut out. Should the queue @@ -44,23 +57,121 @@ static void update_worldstate_file(); 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); +static void write_inventory(struct Thing * player, FILE * file); /* Return map cells sequence as visible to the "player", with invisible cells as - * whitespace. Super-impose over visible map cells map objects positioned there. + * whitespace. Super-impose over visible map cells things positioned there. */ -static char * build_visible_map(struct MapObj * player); +static char * build_visible_map(struct Thing * player); -/* Write to "file" game map as visible to "player", build_visible_map()-drawn. - * Write one row per \n-delimited line. +/* Write to "file" game map as visible to "player" right now, as drawn by + * build_visible_map(), and thereafter game map as memorized by player in its + * .mem_map. Write one row per \n-delimited line. */ -static void write_map(struct MapObj * player, FILE * file); +static void write_map(struct Thing * player, FILE * file); + + + +static void write_key_space(FILE * file, char * key) +{ + try_fwrite(key, strlen(key), 1, file, __func__); + try_fputc(' ', file, __func__); +} + + + +static void write_value(FILE * file, uint32_t value) +{ + char * line = try_malloc(11, __func__); + exit_trouble(-1 == sprintf(line, "%u", value), __func__, s[S_FCN_SPRINTF]); + try_fwrite(line, strlen(line), 1, file, __func__); + free(line); +} + + + +static void write_string(FILE * file, char * string) +{ + uint8_t contains_space = NULL != strchr(string, ' '); + if (contains_space) + { + try_fputc('\'', file, __func__); + } + try_fwrite(string, strlen(string), 1, file, __func__); + if (contains_space) + { + try_fputc('\'', file, __func__); + } +} + + + +static void write_key_space_value(FILE * file, char * key, uint32_t value) +{ + write_key_space(file, key); + write_value(file, value); + try_fputc('\n', file, __func__); +} + + + +static void write_key_space_string(FILE * file, char * key, char * string) +{ + write_key_space(file, key); + write_string(file, string); + try_fputc('\n', file, __func__); +} + + + +static void write_thing(FILE * file, struct Thing * t) +{ + struct Thing * o; + for (o = t->owns; o; o = o->next) + { + write_thing(file, o); + } + write_key_space_value(file, s[S_CMD_T_ID], t->id); + write_key_space_value(file, s[S_CMD_T_TYPE], t->type); + write_key_space_value(file, s[S_CMD_T_POSY], t->pos.y); + write_key_space_value(file, s[S_CMD_T_POSX], t->pos.x); + write_key_space_value(file, s[S_CMD_T_COMMAND], t->command); + write_key_space_value(file, s[S_CMD_T_ARGUMENT], t->arg); + write_key_space_value(file, s[S_CMD_T_PROGRESS], t->progress); + write_key_space_value(file, s[S_CMD_T_HP], t->lifepoints); + for (o = t->owns; o; o = o->next) + { + write_key_space_value(file, s[S_CMD_T_CARRIES], o->id); + } + if (t->mem_map) + { + uint32_t map_size = world.map.length * world.map.length;/* snprintf() */ + char * mem_map_copy = try_malloc(map_size + 1, __func__);/* reads one */ + memcpy(mem_map_copy, t->mem_map, map_size); /* byte beyond map_size */ + mem_map_copy[map_size] = '\0'; /* if string is not \0-terminated. */ + uint16_t y; + char string[UINT8_MAX + 1 + 1]; + for (y = 0; y < world.map.length; y++) + { + + int test = snprintf(string, world.map.length + 1, "%s", + mem_map_copy + (y * world.map.length)); + exit_trouble(test < 0, __func__, "snprintf()"); + write_key_space(file, s[S_CMD_T_MEMMAP]); + write_value(file, y); + try_fputc(' ', file, __func__); + write_string(file, string); + try_fputc('\n', file, __func__); + } + free(mem_map_copy); + } + try_fputc('\n', file, __func__); +} static char * get_message_from_queue() { - char * f_name = "get_message_from_queue()"; char * message = NULL; if (world.queue_size) { @@ -68,7 +179,7 @@ static char * get_message_from_queue() if (0 < cutout_len) { cutout_len++; - message = try_malloc(cutout_len, f_name); + message = try_malloc(cutout_len, __func__); memcpy(message, world.queue, cutout_len); } for (; @@ -82,7 +193,7 @@ static char * get_message_from_queue() } /* un-allocated first. */ else { - char * new_queue = try_malloc(world.queue_size, f_name); + char * new_queue = try_malloc(world.queue_size, __func__); memcpy(new_queue, &(world.queue[cutout_len]), world.queue_size); free(world.queue); world.queue = new_queue; @@ -95,14 +206,13 @@ static char * get_message_from_queue() 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))) + while (EOF == (test = try_fgetc(world.file_in, __func__))) { nanosleep(&dur, NULL); if (time(0) > now + wait_seconds) @@ -117,7 +227,7 @@ static void read_file_into_queue() { c = '\0'; } - char * new_queue = try_malloc(world.queue_size + 1, f_name); + char * new_queue = try_malloc(world.queue_size + 1, __func__); memcpy(new_queue, world.queue, world.queue_size); char * new_pos = new_queue + world.queue_size; * new_pos = c; @@ -125,34 +235,31 @@ static void read_file_into_queue() free(world.queue); world.queue = new_queue; } - while (EOF != (test = try_fgetc(world.file_in, f_name))); + while (EOF != (test = try_fgetc(world.file_in, __func__))); } static void update_worldstate_file() { - char * f_name = "update_worldstate_file()"; - char path_tmp[strlen(world.path_worldstate) + strlen(world.tmp_suffix) + 1]; - sprintf(path_tmp, "%s%s", world.path_worldstate, world.tmp_suffix); - FILE * file = try_fopen(path_tmp, "w", f_name); - struct MapObj * player = get_player(); + char * path_tmp; + FILE * file = atomic_write_start(s[S_PATH_WORLDSTATE], &path_tmp); + struct Thing * player = get_player(); write_value_as_line(world.turn, file); write_value_as_line(player->lifepoints, file); write_inventory(player, file); write_value_as_line(player->pos.y, 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_value_as_line(world.map.length, file); write_map(player, file); if (world.log) { - try_fwrite(world.log, strlen(world.log), 1, file, f_name); + try_fwrite(world.log, strlen(world.log), 1, file, __func__); } - try_fclose_unlink_rename(file, path_tmp, world.path_worldstate, f_name); + atomic_write_finish(file, s[S_PATH_WORLDSTATE], path_tmp); set_cleanup_flag(CLEANUP_WORLDSTATE); - char * dot = ".\n";; - try_fwrite(dot, strlen(dot), 1, world.file_out, f_name); + char * dot = ".\n"; + try_fwrite(dot, strlen(dot), 1, world.file_out, __func__); fflush(world.file_out); } @@ -160,113 +267,118 @@ static void update_worldstate_file() static void write_value_as_line(uint32_t value, FILE * file) { - char * f_name = "write_value_as_line()"; char write_buf[12]; /* Holds 10 digits of uint32_t maximum + \n + \0. */ - sprintf(write_buf, "%u\n", value); - try_fwrite(write_buf, strlen(write_buf), 1, file, f_name); + exit_trouble(sprintf(write_buf,"%u\n",value) < 0,__func__,s[S_FCN_SPRINTF]); + try_fwrite(write_buf, strlen(write_buf), 1, file, __func__); } -static void write_inventory(struct MapObj * player, FILE * file) +static void write_inventory(struct Thing * player, FILE * file) { - char * f_name = "write_inventory()"; - struct MapObj * owned = player->owns; + struct Thing * owned = player->owns; if (NULL == owned) { char * empty = "(none)\n"; - try_fwrite(empty, strlen(empty), 1, file, f_name); + try_fwrite(empty, strlen(empty), 1, file, __func__); } else { uint8_t q; for (q = 0; NULL != owned; q++) { - struct MapObjDef * mod = get_map_object_def(owned->type); - try_fwrite(mod->name, strlen(mod->name), 1, file, f_name); - try_fputc('\n', file, f_name); + struct ThingType * tt = get_thing_type(owned->type); + try_fwrite(tt->name, strlen(tt->name), 1, file, __func__); + try_fputc('\n', file, __func__); owned = owned->next; } } - try_fputc('%', file, f_name); - try_fputc('\n', file, f_name); + try_fputc('%', file, __func__); + try_fputc('\n', file, __func__); } -static char * build_visible_map(struct MapObj * player) +static char * build_visible_map(struct Thing * player) { - 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 = try_malloc(map_size, f_name); + uint32_t map_size = world.map.length * world.map.length; + char * visible_map = try_malloc(map_size, __func__); 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) + if (player->fov_map) /* May fail if player thing was created / positioned */ + { /* by god command after turning off FOV building. */ + uint32_t pos_i; + for (pos_i = 0; pos_i < map_size; pos_i++) { - visible_map[pos_i] = world.map.cells[pos_i]; + if (player->fov_map[pos_i] & VISIBLE) + { + visible_map[pos_i] = world.map.cells[pos_i]; + } } - } - struct MapObj * o; - struct MapObjDef * d; - char c; - uint8_t i; - for (i = 0; i < 2; i++) - { - for (o = world.map_objs; o != 0; o = o->next) + struct Thing * t; + struct ThingType * tt; + char c; + uint8_t i; + for (i = 0; i < 2; i++) { - if ( fov_map[yx_to_map_pos(&o->pos)] & VISIBLE - && ( (0 == i && 0 == o->lifepoints) - || (1 == i && 0 < o->lifepoints))) + for (t = world.things; t != 0; t = t->next) { - d = get_map_object_def(o->type); - c = d->char_on_map; - visible_map[yx_to_map_pos(&o->pos)] = c; + if ( ( player->fov_map[t->pos.y * world.map.length +t->pos.x] + & VISIBLE) + && ( (0 == i && 0 == t->lifepoints) + || (1 == i && 0 < t->lifepoints))) + { + tt = get_thing_type(t->type); + c = tt->char_on_map; + visible_map[t->pos.y * world.map.length + t->pos.x] = c; + } } } } - free(fov_map); return visible_map; } -static void write_map(struct MapObj * player, FILE * file) +static void write_map(struct Thing * player, FILE * file) { - 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++) + for (y = 0; y < world.map.length; y++) { - for (x = 0; x < world.map.size.x; x++) + for (x = 0; x < world.map.length; x++) { - try_fputc(visible_map[(y * world.map.size.x) + x], file, f_name); + try_fputc(visible_map[y * world.map.length + x], file, __func__); } - try_fputc('\n', file, f_name); + try_fputc('\n', file, __func__); } free(visible_map); + for (y = 0; y < world.map.length; y++) + { + for (x = 0; x < world.map.length; x++) + { + try_fputc(player->mem_map[y * world.map.length + x], file, __func__); + } + try_fputc('\n', file, __func__); + } } extern char * io_round() { - char * f_name = "io_round()"; if (0 < world.queue_size) { return get_message_from_queue(); } - if (world.turn != world.last_update_turn) + if (world.do_update) { update_worldstate_file(); - world.last_update_turn = world.turn; + world.do_update = 0; } read_file_into_queue(); if (world.queue_size && '\0' != world.queue[world.queue_size - 1]) { - char * new_queue = try_malloc(world.queue_size + 1, f_name); + char * new_queue = try_malloc(world.queue_size + 1, __func__); memcpy(new_queue, world.queue, world.queue_size); new_queue[world.queue_size] = '\0'; world.queue_size++; @@ -275,3 +387,51 @@ extern char * io_round() } return get_message_from_queue(); } + + + +extern void save_world() +{ + char * path_tmp; + FILE * file = atomic_write_start(s[S_PATH_SAVE], &path_tmp); + write_key_space_value(file, s[S_CMD_MAPLENGTH], world.map.length); + write_key_space_value(file, s[S_CMD_PLAYTYPE], world.player_type); + try_fputc('\n', file, __func__); + struct ThingAction * ta; + for (ta = world.thing_actions; ta; ta = ta->next) + { + write_key_space_value(file, s[S_CMD_TA_ID], ta->id); + write_key_space_value(file, s[S_CMD_TA_EFFORT], ta->effort); + write_key_space_string(file, s[S_CMD_TA_NAME], ta->name); + try_fputc('\n', file, __func__); + } + struct ThingType * tt; + for (tt = world.thing_types; tt; tt = tt->next) + { + write_key_space_value(file, s[S_CMD_TT_ID], tt->id); + write_key_space_value(file, s[S_CMD_TT_STARTN], tt->start_n); + write_key_space_value(file, s[S_CMD_TT_HP], tt->lifepoints); + int test = fprintf(file, "%s %c\n", s[S_CMD_TT_SYMB], tt->char_on_map); + exit_trouble(test < 0, __func__, "fprintf"); + write_key_space_string(file, s[S_CMD_TT_NAME], tt->name); + write_key_space_value(file, s[S_CMD_TT_CONSUM], tt->consumable); + try_fputc('\n', file, __func__); + } + for (tt = world.thing_types; tt; tt = tt->next) + { + write_key_space_value(file, s[S_CMD_TT_ID], tt->id); + write_key_space_value(file, s[S_CMD_TT_CORPS], tt->corpse_id); + } + try_fputc('\n', file, __func__); + write_key_space_value(file, s[S_CMD_SEED_MAP], world.seed_map); + write_key_space_value(file, s[S_CMD_SEED_RAND], world.seed); + write_key_space_value(file, s[S_CMD_TURN], world.turn); + try_fputc('\n', file, __func__); + struct Thing * t; + for (t = world.things; t; t = t->next) + { + write_thing(file, t); + } + write_key_space_value(file, s[S_CMD_WORLD_ACTIVE], 1); + atomic_write_finish(file, s[S_PATH_SAVE], path_tmp); +}