X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Fthing_actions.c;h=df516e45864f2c076b4fd162eec2f96400f1713d;hb=f6615d3be438bbca4997c38c546c0d8724da80d4;hp=ec713ae5bd02dc2e9dac915c48066e154812b151;hpb=491e8bc8e7a9b1d312256817c0b8be7e05b127be;p=plomrogue
diff --git a/src/server/thing_actions.c b/src/server/thing_actions.c
index ec713ae..df516e4 100644
--- a/src/server/thing_actions.c
+++ b/src/server/thing_actions.c
@@ -8,14 +8,15 @@
#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(),
- * 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 "yx_uint8.h" /* mv_yx_in_dir_wrap() */
#include "world.h" /* global world */
@@ -151,6 +152,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 +259,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_wrap(0, NULL, 1);
+ if (legal_move)
{
- if (0 == other_t->lifepoints || other_t == t)
+ for (other_t = world.things; other_t != 0; other_t = other_t->next)
{
- continue;
- }
- if (yx_uint8_cmp(&target, &other_t->pos))
- {
- 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);
+ 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);
@@ -309,7 +318,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;
}