#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(),
* free_things_in_memory()
*/
#include "map.h" /* mv_yx_in_dir_legal() */
-#include "yx_uint8.h" /* mv_yx_in_dir_wrap() */
#include "world.h" /* global world */
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)
}
}
}
- 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);