#include "map_objects.h"
#include <stddef.h> /* NULL */
-#include <stdio.h> /* FILE typedef */
-#include <stdint.h> /* uint8_t, uint16_t, UINT8_MAX */
-#include <stdlib.h> /* free(), atoi() */
-#include <string.h> /* strlen(), memcpy(), memset() */
-#include "../common/err_try_fgets.h" /* err_try_fgets(), err_line(),
- * reset_err_try_fgets_counter()
- */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgetc(),
- * textfile_width()
- */
-#include "../common/rexit.h" /* exit_err(), exit_trouble() */
+#include <stdint.h> /* uint8_t, uint16_t, UINT16_MAX */
+#include <stdlib.h> /* free() */
+#include <string.h> /* memset(), strlen() */
+#include "../common/rexit.h" /* exit_err() */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint8.h" /* yx_uint8 struct */
-#include "cleanup.h" /* set_cleanup_flag() */
#include "map.h" /* is_passable() */
#include "rrand.h" /* rrand() */
#include "world.h" /* global world */
/* Return pointer to map object of "id" in chain starting at "ptr". */
static struct MapObj * get_map_object(struct MapObj * ptr, uint8_t id);
-/* Return random passable (as by is_passable()) position on world.map. */
-static struct yx_uint8 find_passable_pos();
-
-/* Add object of "type" to map on random position. Don't place actor on actor.*/
+/* Add object of "type" to map on passable position. Don't put actor on actor.*/
static void add_map_object(uint8_t type);
-static struct yx_uint8 find_passable_pos()
-{
- struct yx_uint8 pos;
- for (pos.y = pos.x = 0; 0 == is_passable(pos);)
- {
- pos.y = rrand() % world.map.size.y;
- pos.x = rrand() % world.map.size.x;
- }
- return pos;
-}
-
-
-
static void add_map_object(uint8_t type)
{
char * f_name = "add_map_object()";
mo->id = world.map_obj_count++;
mo->type = mod->id;
mo->lifepoints = mod->lifepoints;
+ char * err = "Space to put map object on too hard to find. Map too small?";
+ uint16_t i = 0;
while (1)
{
- struct yx_uint8 pos = find_passable_pos(world.map);
+ struct yx_uint8 pos;
+ for (pos.y = pos.x = 0; 0 == is_passable(pos); i++)
+ {
+ exit_err(UINT16_MAX == i, err);
+ pos.y = rrand() % world.map.size.y;
+ pos.x = rrand() % world.map.size.x;
+ }
struct MapObj * mo_ptr;
uint8_t clear = 1;
for (mo_ptr = world.map_objs; mo_ptr != NULL; mo_ptr = mo_ptr->next)
-extern void init_map_object_defs()
-{
- char * f_name = "init_map_object_defs()";
- char * context = "Failed reading map object definitions file. ";
- char * err_toolarge = "Value is too large.";
- char * err_uniq = "Declaration of ID already used.";
- FILE * file = try_fopen(world.path_map_obj_defs, "r", f_name);
- uint32_t linemax = textfile_width(file);
- struct MapObjDef ** last_mod_ptr_ptr = &world.map_obj_defs;
- char line[linemax + 1];
- reset_err_try_fgets_counter();
- while (1)
- {
- 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()");
- struct MapObjDef * mod = try_malloc(sizeof(struct MapObjDef), f_name);
- mod->next = NULL;
- err_try_fgets(line, linemax, file, context, "nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
- mod->id = atoi(line);
- struct MapObjDef * mod_test = world.map_obj_defs;
- for (; NULL != mod_test; mod_test = mod_test->next)
- {
- err_line(mod->id == mod_test->id, line, context, err_uniq);
- }
- err_try_fgets(line, linemax, file, context, "0nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
- mod->corpse_id = atoi(line);
- err_try_fgets(line, linemax, file, context, "0nfs");
- mod->char_on_map = line[0];
- err_try_fgets(line, linemax, file, context, "0nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
- mod->lifepoints = atoi(line);
- err_try_fgets(line, linemax, file, context, "0nf");
- line[strlen(line) - 1] = '\0';
- mod->name = try_malloc(strlen(line) + 1, f_name);
- memcpy(mod->name, line, strlen(line) + 1);
- err_try_fgets(line, linemax, file, context, "0nfi");
- err_line(atoi(line) > UINT8_MAX, line, context, err_toolarge);
- mod->consumable = atoi(line);
- * last_mod_ptr_ptr = mod;
- last_mod_ptr_ptr = &mod->next;
- err_try_fgets(line, linemax, file, context, "d");
- }
- try_fclose(file, f_name);
- set_cleanup_flag(CLEANUP_MAP_OBJECT_DEFS);
-}
-
-
-
extern void free_map_object_defs(struct MapObjDef * mod_start)
{
if (NULL == mod_start)