X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fthing_actions.c;h=42b77dcabdedf1e4f0905e8304411fe40d78882b;hb=4e4313a0162999f961db391a2dcf943128040e56;hp=6f7254490c9819f37a009e5458649956140d8294;hpb=cf0d81ea863df7adb1bdd862708571b0e40a73cb;p=plomrogue
diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 6f72544..42b77dc 100644
--- 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 /* NULL */
@@ -262,8 +267,10 @@ extern void actor_move(struct Thing * t)
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)
{
+ passable = '.' == world.map.cells[target.y*world.map.length + target.x];
for (other_t = world.things; other_t != 0; other_t = other_t->next)
{
if (0 == other_t->lifepoints || other_t == t)
@@ -277,8 +284,6 @@ extern void actor_move(struct Thing * t)
}
}
}
- char target_cell = world.map.cells[target.y * world.map.length + target.x];
- uint8_t passable = legal_move && '.' == target_cell;
if (passable)
{
set_thing_position(t, target);