Client: Simplify display of available keybindings.

[plomrogue] / src / server / thing_actions.c

diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index ec713ae5bd02dc2e9dac915c48066e154812b151..42b77dcabdedf1e4f0905e8304411fe40d78882b 100644 (file)
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -1,4 +1,9 @@
-/* src/server/thing_actions.c */
+/* src/server/thing_actions.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
 
 #include "thing_actions.h"
 #include <stddef.h> /* NULL */
@@ -8,14 +13,14 @@
 #include <string.h> /* strlen(), memcpy(), strncmp() */
 #include "../common/rexit.h" /* exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
-#include "../common/yx_uint8.h" /* struct yx_uint8 */
+#include "../common/yx_uint8.h" /* yx_uint8 */
 #include "field_of_view.h" /* build_fov_map() */
 #include "hardcoded_strings.h" /* s */
 #include "things.h" /* Thing, ThingType, get_player(), own_thing(),
-                     * set_thing_position(), get_thing_type()
+                     * set_thing_position(), get_thing_type(),
+                     * free_things_in_memory()
                      */
-#include "map.h" /* is_passable() */
-#include "yx_uint8.h" /* mv_yx_in_dir(), yx_uint8_cmp() */
+#include "map.h" /* mv_yx_in_dir_legal() */
 #include "world.h" /* global world */
 
 
@@ -151,6 +156,8 @@ static void actor_hits_actor(struct Thing * hitter, struct Thing * hitted)
             hitted->fov_map = NULL;
             free(hitted->mem_map);
             hitted->mem_map = NULL;
+            free_things_in_memory(hitted->t_mem);
+            hitted->t_mem = NULL;
         }
         update_log(" It dies.");
     }
@@ -256,21 +263,27 @@ extern void actor_wait(struct Thing * t)
 extern void actor_move(struct Thing * t)
 {
     char d = t->arg;
-    struct yx_uint8 target = mv_yx_in_dir(d, t->pos);
     struct Thing * other_t;
-    for (other_t = world.things; other_t != 0; other_t = other_t->next)
+    struct yx_uint8 target = t->pos;
+    uint8_t legal_move = mv_yx_in_dir_legal(d, &target);
+    mv_yx_in_dir_legal(0, NULL);
+    uint8_t passable = 0;
+    if (legal_move)
     {
-        if (0 == other_t->lifepoints || other_t == t)
-        {
-            continue;
-        }
-        if (yx_uint8_cmp(&target, &other_t->pos))
+        passable = '.' == world.map.cells[target.y*world.map.length + target.x];
+        for (other_t = world.things; other_t != 0; other_t = other_t->next)
         {
-            actor_hits_actor(t, other_t);
-            return;
+            if (0 == other_t->lifepoints || other_t == t)
+            {
+                continue;
+            }
+            if (target.y == other_t->pos.y && target.x == other_t->pos.x)
+            {
+               actor_hits_actor(t, other_t);
+               return;
+            }
         }
     }
-    uint8_t passable = is_passable(target);
     if (passable)
     {
         set_thing_position(t, target);
@@ -309,7 +322,7 @@ extern void actor_pick(struct Thing * t)
     struct Thing * t_i;
     for (t_i = world.things; t_i; t_i = t_i->next)
     {
-        if (t_i != t && yx_uint8_cmp(&t_i->pos, &t->pos))
+        if (t_i != t && t_i->pos.y == t->pos.y && t_i->pos.x == t->pos.x)
         {
             picked = t_i;
         }