X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=8b09ec0f8bdf4c8b898d1e7f15947d8390442f13;hb=d92f16d5959fc846d3eaf669517eecb3969cda08;hp=4fbf6ed07fad2dee6614a9f0f6843111f9ee7823;hpb=4948c10c3a64bf76c977614ae735af2f8f9b2c2c;p=plomrogue
diff --git a/src/server/io.c b/src/server/io.c
index 4fbf6ed..8b09ec0 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -5,10 +5,10 @@
#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(),
@@ -16,7 +16,9 @@
*/
#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 "map.h" /* yx_to_map_pos() */
+#include "things.h" /* Thing, ThingType, get_thing_type(), get_player() */
#include "world.h" /* global world */
@@ -42,12 +44,17 @@ 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);
-/* 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 things positioned there.
*/
-static void write_map(FILE * file);
+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.
+ */
+static void write_map(struct Thing * player, FILE * file);
@@ -129,15 +136,14 @@ static void 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();
+ 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);
@@ -161,10 +167,10 @@ static void write_value_as_line(uint32_t value, FILE * file)
-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 +181,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 +193,57 @@ 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 * 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);
+ uint16_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++)
{
- for (o = world.map_objs; o != 0; o = o->next)
+ for (t = world.things; t != 0; t = t->next)
{
- if (( (0 == i && 0 == o->lifepoints)
- || (1 == i && 0 < o->lifepoints)))
+ if ( player->fov_map[yx_to_map_pos(&t->pos)] & VISIBLE
+ && ( (0 == i && 0 == t->lifepoints)
+ || (1 == i && 0 < t->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;
+ 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);
}