Server: Internally, rename "map object" stuff to "thing" stuff.

[plomrogue] / src / server / map_objects.c

diff --git a/src/server/map_objects.c b/src/server/map_objects.c
deleted file mode 100644 (file)
index fa20c17..0000000
--- a/src/server/map_objects.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* src/server/map_objects.c */
-
-#include "map_objects.h"
-#include <stddef.h> /* NULL */
-#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 "map.h" /* is_passable() */
-#include "rrand.h" /* rrand() */
-#include "world.h" /* global world */
-#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);
-
-/* 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 MapObj * get_map_object(struct MapObj * ptr, uint8_t id)
-{
-    while (1)
-    {
-        if (NULL == ptr || id == ptr->id)
-        {
-            return ptr;
-        }
-        struct MapObj * owned_object = get_map_object(ptr->owns, id);
-        if (NULL != owned_object)
-        {
-            return ptr;
-        }
-        ptr = ptr->next;
-    }
-}
-
-
-
-static void add_map_object(uint8_t type)
-{
-    char * f_name = "add_map_object()";
-    struct MapObjDef * mod = get_map_object_def(type);
-    struct MapObj *    mo  = try_malloc(sizeof(struct MapObj), f_name);
-    memset(mo, 0, sizeof(struct MapObj));
-    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;
-        for (pos.y = pos.x = 0; 0 == is_passable(pos); i++)
-        {
-            exit_err(UINT16_MAX == i, err);
-            pos.y = rrand() % world.map.length;
-            pos.x = rrand() % world.map.length;
-        }
-        struct MapObj * mo_ptr;
-        uint8_t clear = 1;
-        for (mo_ptr = world.map_objs; mo_ptr != NULL; mo_ptr = mo_ptr->next)
-        {
-            if (yx_uint8_cmp(&pos, &mo_ptr->pos) && 0 != mo_ptr->lifepoints)
-            {
-                clear = 0;
-                break;
-            }
-        }
-        if (1 == clear)
-        {
-            mo->pos = pos;
-            break;
-        }
-    }
-    struct MapObj ** mo_ptr_ptr = &world.map_objs;
-    for (; NULL != * mo_ptr_ptr; mo_ptr_ptr = &(*mo_ptr_ptr)->next);
-    * mo_ptr_ptr = mo;
-}
-
-
-
-extern void free_map_object_defs(struct MapObjDef * mod_start)
-{
-    if (NULL == mod_start)
-    {
-        return;
-    }
-    free_map_object_defs(mod_start->next);
-    free(mod_start->name);
-    free(mod_start);
-}
-
-
-
-extern void add_map_objects(uint8_t type, uint8_t n)
-{
-    uint8_t i;
-    for (i = 0; i < n; i++)
-    {
-        add_map_object(type);
-    }
-}
-
-
-
-extern void free_map_objects(struct MapObj * mo_start)
-{
-    if (NULL == mo_start)
-    {
-        return;
-    }
-    free_map_objects(mo_start->owns);
-    free_map_objects(mo_start->next);
-    free(mo_start->fov_map);
-    free(mo_start);
-    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.  */
-}
-
-
-
-extern void own_map_object(struct MapObj ** target, struct MapObj ** source,
-                           uint8_t id)
-{
-    struct MapObj * mo;
-    if (id == (*source)->id)
-    {
-        mo = * source;
-        * source = mo->next;
-    }
-    else
-    {
-        struct MapObj * penult = * source;
-        while (1)
-        {
-            if (id == penult->next->id)
-            {
-                break;
-            }
-            penult = penult->next;
-        }
-        mo = penult->next;
-        penult->next = mo->next;
-    }
-    struct MapObj ** mo_ptr_ptr = target;
-    for (; NULL != * mo_ptr_ptr; mo_ptr_ptr = &(*mo_ptr_ptr)->next);
-    * mo_ptr_ptr = mo;
-    mo->next = NULL;
-}
-
-
-
-extern struct MapObj * get_player()
-{
-    return get_map_object(world.map_objs, 0);
-}
-
-
-
-extern struct MapObjDef * get_map_object_def(uint8_t id)
-{
-    struct MapObjDef * mod = world.map_obj_defs;
-    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_uint8 pos)
-{
-    mo->pos = pos;
-    struct MapObj * owned = mo->owns;
-    for (; owned != NULL; set_object_position(owned, pos), owned = owned->next);
-}