X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fserver%2Fthings.c;h=bbe9dbffe39388399b741965c7ead8bb2aa61baa;hb=19ebce2d7c380212d1b8e45a8e5c92e5a9c6d9c0;hp=4097f61a65707fc01dfe07a11a7cfa77b65c8dbd;hpb=51aa064d49b98de950dbcd7b154fa73d5d2eb359;p=plomrogue

diff --git a/src/server/things.c b/src/server/things.c
index 4097f61..bbe9dbf 100644
--- a/src/server/things.c
+++ b/src/server/things.c
@@ -28,11 +28,14 @@ struct NextAndId
 
 
 
+/* Free ThingsInMemory chain starting at "tm". */
+static void free_things_in_memory(struct ThingInMemory * tm);
+
 /* To linked list of NextAndId structs (or rather structs whose start region is
  * compatible to it) starting at "start", add newly allocated element of
  * "n_size" and an ID that is either "id" or, if "id" is <= UINT8_MAX and >=
- * "id_start", get lowest ID for new thing ("struct_id"==0), thing type
- * ("struct_id"==1) or thing action ("struct_id"==2).
+ * "id_start", get lowest ID >= "start_id" and <= UINT8_MAX for new thing
+ * ("struct_id"=0), thing type ("struct_id"=1) or thing action ("struct_id"=2).
  */
 static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id,
                                              int16_t id, uint8_t struct_id,
@@ -40,6 +43,18 @@ static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id,
 
 
 
+static void free_things_in_memory(struct ThingInMemory * tm)
+{
+    if (!tm)
+    {
+        return;
+    }
+    free_things_in_memory(tm->next);
+    free(tm);
+}
+
+
+
 static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id,
                                              int16_t id, uint8_t struct_id,
                                              struct NextAndId ** start)
@@ -67,7 +82,7 @@ static struct NextAndId * add_to_struct_list(size_t n_size, uint8_t start_id,
         }
     }
     struct NextAndId ** nai_ptr_ptr = start;
-    for (; NULL != * nai_ptr_ptr; nai_ptr_ptr = &(*nai_ptr_ptr)->next);
+    for (; * nai_ptr_ptr; nai_ptr_ptr = &(*nai_ptr_ptr)->next);
     *nai_ptr_ptr = nai;
     return nai;
 }
@@ -99,6 +114,7 @@ extern struct ThingType * add_thing_type(int16_t id)
                                                  &world.thing_types);
     set_cleanup_flag(CLEANUP_THING_TYPES);
     tt->name = strdup("(none)");
+    tt->corpse_id = tt->id;
     return tt;
 }
 
@@ -120,9 +136,22 @@ extern struct Thing * add_thing(int16_t id, uint8_t type, uint8_t y, uint8_t x)
 
 
 
+extern void add_thing_to_memory_map(struct Thing * t, uint8_t type,
+                                    uint8_t y, uint8_t x)
+{
+    struct ThingInMemory * tm=try_malloc(sizeof(struct ThingInMemory),__func__);
+    tm->type = type;
+    tm->pos.y = y;
+    tm->pos.x = x;
+    tm->next = t->t_mem;
+    t->t_mem = tm;
+}
+
+
+
 extern void free_thing_actions(struct ThingAction * ta)
 {
-    if (NULL == ta)
+    if (!ta)
     {
         return;
     }
@@ -135,7 +164,7 @@ extern void free_thing_actions(struct ThingAction * ta)
 
 extern void free_thing_types(struct ThingType * tt)
 {
-    if (NULL == tt)
+    if (!tt)
     {
         return;
     }
@@ -148,13 +177,15 @@ extern void free_thing_types(struct ThingType * tt)
 
 extern void free_things(struct Thing * t)
 {
-    if (NULL == t)
+    if (!t)
     {
         return;
     }
     free_things(t->owns);
     free_things(t->next);
     free(t->fov_map);
+    free(t->mem_map);
+    free_things_in_memory(t->t_mem);
     free(t);
     if (t == world.things)         /* So add_things()' NULL-delimited thing   */
     {                              /* iteration loop does not iterate over    */
@@ -167,7 +198,7 @@ extern void free_things(struct Thing * t)
 extern struct ThingAction * get_thing_action(uint8_t id)
 {
     struct ThingAction * ta = world.thing_actions;
-    for (; NULL != ta && id != ta->id; ta = ta->next);
+    for (; ta && id != ta->id; ta = ta->next);
     return ta;
 }
 
@@ -176,7 +207,7 @@ extern struct ThingAction * get_thing_action(uint8_t id)
 extern struct ThingType * get_thing_type(uint8_t id)
 {
     struct ThingType * tt = world.thing_types;
-    for (; NULL != tt && id != tt->id; tt = tt->next);
+    for (; tt && id != tt->id; tt = tt->next);
     return tt;
 }
 
@@ -185,7 +216,7 @@ extern struct ThingType * get_thing_type(uint8_t id)
 extern uint8_t get_thing_action_id_by_name(char * name)
 {
     struct ThingAction * ta = world.thing_actions;
-    while (NULL != ta)
+    while (ta)
     {
         if (0 == strcmp(ta->name, name))
         {
@@ -206,14 +237,14 @@ extern struct Thing * get_thing(struct Thing * ptr, uint8_t id, uint8_t deep)
 {
     while (1)
     {
-        if (NULL == ptr || id == ptr->id)
+        if (!ptr || id == ptr->id)
         {
             return ptr;
         }
         if (deep)
         {
             struct Thing * owned_thing = get_thing(ptr->owns, id, 1);
-            if (NULL != owned_thing)
+            if (owned_thing)
             {
                 return ptr;
             }
@@ -293,7 +324,7 @@ extern void own_thing(struct Thing ** target, struct Thing ** source,
         penult->next = t->next;
     }
     struct Thing ** t_ptr_ptr = target;
-    for (; NULL != * t_ptr_ptr; t_ptr_ptr = &(*t_ptr_ptr)->next);
+    for (; * t_ptr_ptr; t_ptr_ptr = &(*t_ptr_ptr)->next);
     * t_ptr_ptr = t;
     t->next = NULL;
 }
@@ -304,5 +335,5 @@ extern void set_thing_position(struct Thing * t, struct yx_uint8 pos)
 {
     t->pos = pos;
     struct Thing * owned = t->owns;
-    for (; owned != NULL; set_thing_position(owned, pos), owned = owned->next);
+    for (; owned; set_thing_position(owned, pos), owned = owned->next);
 }