X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=258ec45f5da45673e6db7ed8113dac3128d6e35f;hb=778534bf6946fe0fef17e353c55678d248d8d09d;hp=4fbf6ed07fad2dee6614a9f0f6843111f9ee7823;hpb=4948c10c3a64bf76c977614ae735af2f8f9b2c2c;p=plomrogue
diff --git a/src/server/io.c b/src/server/io.c
index 4fbf6ed..258ec45 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -5,22 +5,32 @@
#include /* global errno */
#include /* PIPE_BUF */
#include /* size_t, NULL */
-#include /* uint8_t, uint32_t */
+#include /* uint8_t, uint16_t, uint32_t */
#include /* defines EOF, FILE, sprintf() */
#include /* free() */
-#include /* strlen(), memcpy() */
+#include /* strlen(), memcpy(), memset() */
#include /* time_t */
#include /* time(), nanosleep() */
#include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(),
* 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 "map_objects.h" /* structs MapObj, MapObjDef, get_map_obj_def() */
+#include "field_of_view.h" /* VISIBLE */
+#include "hardcoded_strings.h" /* s */
+#include "map.h" /* yx_to_map_pos() */
+#include "things.h" /* Thing, ThingType, get_thing_type(), get_player() */
#include "world.h" /* global world */
+/* Write to "file" god commands (one per line) to recreate thing "t". */
+static void write_key_value(FILE * file, char * key, uint32_t value);
+
+/* 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
@@ -42,12 +52,56 @@ 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 things positioned there.
+ */
+static char * build_visible_map(struct Thing * player);
-/* Write to "file" game map, with map objects super-imposed. Write one row per
- * \n-delimited line. Super-impose animated objects over inanimate objects.
+/* Write to "file" game map as visible to "player", build_visible_map()-drawn.
+ * Write one row per \n-delimited line.
*/
-static void write_map(FILE * file);
+static void write_map(struct Thing * player, FILE * file);
+
+
+
+static void write_key_value(FILE * file, char * key, uint32_t value)
+{
+ char * f_name = "write_key_value()";
+ try_fwrite(key, strlen(key), 1, file, f_name);
+ try_fputc(' ', file, f_name);
+ char * line = try_malloc(11, f_name);
+ exit_trouble(-1 == sprintf(line, "%u", value), f_name, "sprintf()");
+ try_fwrite(line, strlen(line), 1, file, f_name);
+ free(line);
+ try_fputc('\n', file, f_name);
+}
+
+
+
+static void write_thing(FILE * file, struct Thing * t)
+{
+ char * f_name = "write_thing()";
+ struct Thing * o;
+ for (o = t->owns; o; o = o->next)
+ {
+ write_thing(file, o);
+ }
+ write_key_value(file, s[CMD_THING], t->id);
+ write_key_value(file, s[CMD_TYPE], t->type);
+ write_key_value(file, s[CMD_POS_Y], t->pos.y);
+ write_key_value(file, s[CMD_POS_X], t->pos.x);
+ write_key_value(file, s[CMD_COMMAND], t->command);
+ write_key_value(file, s[CMD_ARGUMENT], t->arg);
+ write_key_value(file, s[CMD_PROGRESS], t->progress);
+ write_key_value(file, s[CMD_LIFEPOINTS], t->lifepoints);
+ for (o = t->owns; o; o = o->next)
+ {
+ write_key_value(file, s[CMD_CARRIES], o->id);
+ }
+ try_fputc('\n', file, f_name);
+}
@@ -126,23 +180,25 @@ static void read_file_into_queue()
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);
+ uint16_t size = strlen(s[PATH_WORLDSTATE]) + strlen(s[PATH_SUFFIX_TMP]) + 1;
+ char * path_tmp = try_malloc(size, f_name);
+ int test = sprintf(path_tmp, "%s%s", s[PATH_WORLDSTATE],s[PATH_SUFFIX_TMP]);
+ exit_trouble(test < 0, f_name, "sprintf()");
FILE * file = try_fopen(path_tmp, "w", f_name);
- struct MapObj * player = get_player();
+ 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_map(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_fclose_unlink_rename(file, path_tmp, world.path_worldstate, f_name);
+ try_fclose_unlink_rename(file, path_tmp, s[PATH_WORLDSTATE], f_name);
+ free(path_tmp);
set_cleanup_flag(CLEANUP_WORLDSTATE);
char * dot = ".\n";;
try_fwrite(dot, strlen(dot), 1, world.file_out, f_name);
@@ -155,16 +211,16 @@ 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);
+ exit_trouble(sprintf(write_buf, "%u\n", value) < 0, f_name, "sprintf()");
try_fwrite(write_buf, strlen(write_buf), 1, file, f_name);
}
-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";
@@ -175,8 +231,8 @@ static void write_inventory(struct MapObj * player, FILE * file)
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);
+ struct ThingType * tt = get_thing_type(owned->type);
+ try_fwrite(tt->name, strlen(tt->name), 1, file, f_name);
try_fputc('\n', file, f_name);
owned = owned->next;
}
@@ -187,38 +243,60 @@ static void write_inventory(struct MapObj * player, FILE * file)
-static void write_map(FILE * file)
+static char * build_visible_map(struct Thing * player)
{
- char * f_name = "write_map()";
- 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);
- 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)
+ char * f_name = "build_visible_map()";
+ uint32_t map_size = world.map.length * world.map.length;
+ char * visible_map = try_malloc(map_size, f_name);
+ memset(visible_map, ' ', map_size);
+ 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++)
+ {
+ if (player->fov_map[pos_i] & VISIBLE)
+ {
+ visible_map[pos_i] = world.map.cells[pos_i];
+ }
+ }
+ struct Thing * t;
+ struct ThingType * tt;
+ char c;
+ uint8_t i;
+ for (i = 0; i < 2; i++)
{
- if (( (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[(o->pos.y * world.map.size.x) + o->pos.x] = c;
+ if ( player->fov_map[yx_to_map_pos(&t->pos)] & VISIBLE
+ && ( (0 == i && 0 == t->lifepoints)
+ || (1 == i && 0 < t->lifepoints)))
+ {
+ tt = get_thing_type(t->type);
+ c = tt->char_on_map;
+ visible_map[yx_to_map_pos(&t->pos)] = c;
+ }
}
}
}
+ return visible_map;
+}
+
+
+
+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, f_name);
}
try_fputc('\n', file, f_name);
}
+ free(visible_map);
}
@@ -247,3 +325,25 @@ extern char * io_round()
}
return get_message_from_queue();
}
+
+
+
+extern void save_world()
+{
+ char * f_name = "save_world()";
+ char * path = s[PATH_SAVE];
+ FILE * file = try_fopen(path, "w", f_name);
+ write_key_value(file, s[CMD_DO_FOV], 0);
+ try_fputc('\n', file, f_name);
+ write_key_value(file, s[CMD_SEED_MAP], world.seed_map);
+ write_key_value(file, s[CMD_SEED_RAND], world.seed);
+ write_key_value(file, s[CMD_TURN], world.turn);
+ try_fputc('\n', file, f_name);
+ struct Thing * t;
+ for (t = world.things; t; t = t->next)
+ {
+ write_thing(file, t);
+ }
+ write_key_value(file, s[CMD_DO_FOV], 1);
+ try_fclose(file, f_name);
+}