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=9f1f5726a3d2f82c33539800b155decacaab6d07;hpb=58486c337a7b1f04311801d902fed41ed3f67315;p=plomrogue
diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index 9f1f572..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 */
@@ -8,7 +13,7 @@
#include /* 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(),
@@ -16,7 +21,6 @@
* free_things_in_memory()
*/
#include "map.h" /* mv_yx_in_dir_legal() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap(), yx_uint8_cmp() */
#include "world.h" /* global world */
@@ -262,24 +266,24 @@ extern void actor_move(struct Thing * t)
struct Thing * other_t;
struct yx_uint8 target = t->pos;
uint8_t legal_move = mv_yx_in_dir_legal(d, &target);
- mv_yx_in_dir_wrap(0, NULL, 1);
+ 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)
{
continue;
}
- if (yx_uint8_cmp(&target, &other_t->pos))
+ if (target.y == other_t->pos.y && target.x == other_t->pos.x)
{
- actor_hits_actor(t, other_t);
+ actor_hits_actor(t, other_t);
return;
}
}
}
- 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);
@@ -318,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;
}