--- deliantra/server/include/map.h 2007/01/29 15:04:21 1.62 +++ deliantra/server/include/map.h 2007/01/29 16:11:48 1.63 @@ -378,13 +378,14 @@ //TODO: these should be refactored into things like xy_normalise // and so on. -int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); -int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); -int out_of_map(maptile *m, int x, int y); -maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); -void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); -void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); -int on_same_map(const object *op1, const object *op2); +int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); +int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y); +int out_of_map (maptile *m, int x, int y); +maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); +void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); +void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); +int on_same_map (const object *op1, const object *op2); +int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); // adjust map, x and y for tiled maps and return true if the position is valid at all inline bool