X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fmap_objects.c;h=ac36394ae9f5169bc37dcac87181d197a6ef634d;hb=12239c92a51581d5bf621992f3f3ef9de6b76e59;hp=abcb6acfc35da8b10c64b942752ebe5c85e07a90;hpb=651c99ff66ae4704021ee15136707c892ed243d6;p=plomrogue

diff --git a/src/server/map_objects.c b/src/server/map_objects.c
index abcb6ac..ac36394 100644
--- a/src/server/map_objects.c
+++ b/src/server/map_objects.c
@@ -2,30 +2,23 @@
 
 #include "map_objects.h"
 #include <stddef.h> /* NULL */
-#include <stdio.h> /* FILE typedef */
-#include <stdint.h> /* uint8_t, uint16_t */
-#include <stdlib.h> /* free(), atoi() */
-#include <string.h> /* strlen(), memcpy(), strtok(), memset() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(),
-                                  * textfile_sizes()
-                                  */
+#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_uint16.h" /* yx_uint16 struct */
-#include "cleanup.h" /* set_cleanup_flag() */
+#include "../common/yx_uint8.h" /* yx_uint8 struct */
 #include "map.h" /* is_passable() */
 #include "rrand.h" /* rrand() */
 #include "world.h" /* global world */
-#include "yx_uint16.h" /* yx_uint16_cmp() */
+#include "yx_uint8.h" /* yx_uint8_cmp() */
 
 
 
 /* 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_uint16 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);
 
 
@@ -49,19 +42,6 @@ static struct MapObj * get_map_object(struct MapObj * ptr, uint8_t id)
 
 
 
-static struct yx_uint16 find_passable_pos()
-{
-    struct yx_uint16 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()";
@@ -71,14 +51,22 @@ static void add_map_object(uint8_t type)
     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_uint16 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)
         {
-            if (yx_uint16_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints)
+            if (yx_uint8_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints)
             {
                 clear = 0;
                 break;
@@ -97,34 +85,6 @@ static void add_map_object(uint8_t type)
 
 
 
-extern void init_map_object_defs(char * filename)
-{
-    char * f_name = "init_map_object_defs()";
-    FILE * file = try_fopen(filename, "r", f_name);
-    uint16_t linemax = textfile_sizes(file, NULL);
-    struct MapObjDef ** last_mod_ptr_ptr = &world.map_obj_defs;
-    char * delim = " ";
-    char line[linemax + 1];
-    while (try_fgets(line, linemax + 1, file, f_name))
-    {
-        struct MapObjDef * mod = try_malloc(sizeof(struct MapObjDef), f_name);
-        mod->next = NULL;
-        mod->id = atoi(strtok(line, delim));
-        mod->corpse_id = atoi(strtok(NULL, delim));
-        mod->char_on_map = * strtok(NULL, delim);
-        mod->lifepoints = atoi(strtok(NULL, delim));
-        char * name = strtok(NULL, "\n");
-        mod->name = try_malloc(strlen(name) + 1, f_name);
-        memcpy(mod->name, name, strlen(name) + 1);
-        * last_mod_ptr_ptr = mod;
-        last_mod_ptr_ptr = &mod->next;
-    }
-    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)
@@ -134,7 +94,6 @@ extern void free_map_object_defs(struct MapObjDef * mod_start)
     free_map_object_defs(mod_start->next);
     free(mod_start->name);
     free(mod_start);
-    mod_start = NULL;
 }
 
 
@@ -159,10 +118,10 @@ extern void free_map_objects(struct MapObj * mo_start)
     free_map_objects(mo_start->owns);
     free_map_objects(mo_start->next);
     free(mo_start);
-    if (mo_start == world.map_objs)
-    {
-        world.map_objs = NULL;
-    }
+    if (mo_start == world.map_objs)  /* So add_map_objects()' NULL-delimited  */
+    {                                /* map object iteration loop does not    */
+        world.map_objs = NULL;       /* iterate over freed memory when called */
+    }                                /* the 1st time after world re-seeding.  */
 }
 
 
@@ -208,13 +167,17 @@ extern struct MapObj * get_player()
 extern struct MapObjDef * get_map_object_def(uint8_t id)
 {
     struct MapObjDef * mod = world.map_obj_defs;
-    for (; id != mod->id; mod = mod->next);
+    for (; NULL != mod && id != mod->id; mod = mod->next);
+    char * err_intro = "Requested map object definition of unused ID ";
+    char err[strlen(err_intro) + 3 + 1 + 1];
+    sprintf(err, "%s%d.", err_intro, id);
+    exit_err(NULL == mod, err);
     return mod;
 }
 
 
 
-extern void set_object_position(struct MapObj * mo, struct yx_uint16 pos)
+extern void set_object_position(struct MapObj * mo, struct yx_uint8 pos)
 {
     mo->pos = pos;
     struct MapObj * owned = mo->owns;