#include <errno.h> /* global errno */
#include <limits.h> /* PIPE_BUF */
#include <stddef.h> /* size_t, NULL */
-#include <stdint.h> /* uint8_t, uint32_t */
+#include <stdint.h> /* uint8_t, uint16_t, uint32_t */
#include <stdio.h> /* defines EOF, FILE, sprintf() */
#include <stdlib.h> /* free() */
-#include <string.h> /* strlen(), memcpy() */
+#include <string.h> /* strlen(), memcpy(), memset() */
#include <sys/types.h> /* time_t */
#include <time.h> /* time(), nanosleep() */
#include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(),
*/
#include "../common/try_malloc.h" /* try_malloc() */
#include "cleanup.h" /* set_cleanup_flag() */
-#include "field_of_view.h" /* build_visible_map() */
+#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 */
/* 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 as visible to the player, build_visible_map()-drawn.
+/* 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 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(FILE * file);
+static void write_map(struct MapObj * player, FILE * 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);
-static void write_map(FILE * file)
+static char * build_visible_map(struct MapObj * 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);
+ 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;
+ uint8_t i;
+ for (i = 0; i < 2; i++)
+ {
+ for (o = world.map_objs; o != 0; o = o->next)
+ {
+ 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[yx_to_map_pos(&o->pos)] = c;
+ }
+ }
+ }
+ free(fov_map);
+ return visible_map;
+}
+
+
+
+static void write_map(struct MapObj * player, FILE * file)
{
char * f_name = "write_map()";
- char * visible_map = build_visible_map();
+ char * visible_map = build_visible_map(player);
uint16_t x, y;
for (y = 0; y < world.map.size.y; y++)
{