… | |
… | |
134 | MoveType ACC (RW, move_off); /* What movement types are activated */ |
134 | MoveType ACC (RW, move_off); /* What movement types are activated */ |
135 | |
135 | |
136 | void update_ (); |
136 | void update_ (); |
137 | MTH void update () |
137 | MTH void update () |
138 | { |
138 | { |
139 | if (!(flags_ & P_UPTODATE)) |
139 | if (expect_false (!(flags_ & P_UPTODATE))) |
140 | update_ (); |
140 | update_ (); |
141 | } |
141 | } |
142 | |
142 | |
143 | MTH uint8 flags () |
143 | MTH uint8 flags () |
144 | { |
144 | { |
… | |
… | |
403 | // and so on. |
403 | // and so on. |
404 | int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); |
404 | int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); |
405 | int out_of_map (maptile *m, int x, int y); |
405 | int out_of_map (maptile *m, int x, int y); |
406 | maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); |
406 | maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); |
407 | void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); |
407 | void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); |
408 | void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); |
408 | void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); |
409 | int on_same_map (const object *op1, const object *op2); |
409 | int on_same_map (const object *op1, const object *op2); |
410 | int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); |
410 | int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); |
411 | |
411 | |
412 | // adjust map, x and y for tiled maps and return true if the position is valid at all |
412 | // adjust map, x and y for tiled maps and return true if the position is valid at all |
413 | static inline bool |
413 | static inline bool |