… | |
… | |
178 | * region, if a value isn't defined in the current region |
178 | * region, if a value isn't defined in the current region |
179 | * we traverse this series of pointers until it is. |
179 | * we traverse this series of pointers until it is. |
180 | */ |
180 | */ |
181 | char *ACC (RW, longname); /* Official title of the region, this might be defined |
181 | char *ACC (RW, longname); /* Official title of the region, this might be defined |
182 | * to be the same as name*/ |
182 | * to be the same as name*/ |
183 | char *ACC (RW, msg); /* the description of the region */ |
183 | shstr ACC (RW, msg); /* the description of the region */ |
184 | uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ |
184 | uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ |
185 | sint8 ACC (RW, fallback); /* whether, in the event of a region not existing, |
185 | sint8 ACC (RW, fallback); /* whether, in the event of a region not existing, |
186 | * this should be the one we fall back on as the default */ |
186 | * this should be the one we fall back on as the default */ |
187 | shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ |
187 | shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ |
188 | sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ |
188 | sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ |
… | |
… | |
376 | object *part; |
376 | object *part; |
377 | }; |
377 | }; |
378 | |
378 | |
379 | //TODO: these should be refactored into things like xy_normalise |
379 | //TODO: these should be refactored into things like xy_normalise |
380 | // and so on. |
380 | // and so on. |
381 | int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); |
381 | int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); |
382 | int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); |
382 | int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y); |
383 | int out_of_map(maptile *m, int x, int y); |
383 | int out_of_map (maptile *m, int x, int y); |
384 | maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); |
384 | maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); |
385 | void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); |
385 | void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); |
386 | void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); |
386 | void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); |
387 | int on_same_map(const object *op1, const object *op2); |
387 | int on_same_map (const object *op1, const object *op2); |
|
|
388 | int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); |
388 | |
389 | |
389 | // adjust map, x and y for tiled maps and return true if the position is valid at all |
390 | // adjust map, x and y for tiled maps and return true if the position is valid at all |
390 | inline bool |
391 | inline bool |
391 | xy_normalise (maptile *&map, sint16 &x, sint16 &y) |
392 | xy_normalise (maptile *&map, sint16 &x, sint16 &y) |
392 | { |
393 | { |