ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.c
(Generate patch)

Comparing deliantra/server/common/map.c (file contents):
Revision 1.2 by root, Wed Feb 8 03:46:15 2006 UTC vs.
Revision 1.5 by root, Wed Feb 22 19:08:43 2006 UTC

1/* 1/*
2 * static char *rcsid_map_c = 2 * static char *rcsid_map_c =
3 * "$Id: map.c,v 1.2 2006/02/08 03:46:15 root Exp $"; 3 * "$Id: map.c,v 1.5 2006/02/22 19:08:43 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
207 * Prints out debug-information about a map. 207 * Prints out debug-information about a map.
208 * Dumping these at llevError doesn't seem right, but is 208 * Dumping these at llevError doesn't seem right, but is
209 * necessary to make sure the information is in fact logged. 209 * necessary to make sure the information is in fact logged.
210 */ 210 */
211 211
212void dump_map(mapstruct *m) { 212void dump_map(const mapstruct *m) {
213 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory); 213 LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory);
214 LOG(llevError,"Size: %dx%d Start: %d,%d\n", 214 LOG(llevError,"Size: %dx%d Start: %d,%d\n",
215 MAP_WIDTH(m), MAP_HEIGHT(m), 215 MAP_WIDTH(m), MAP_HEIGHT(m),
216 MAP_ENTER_X(m), MAP_ENTER_Y(m)); 216 MAP_ENTER_X(m), MAP_ENTER_Y(m));
217 217
218 if(m->msg!=NULL) 218 if(m->msg!=NULL)
219 LOG(llevError,"Message:\n%s",m->msg); 219 LOG(llevError,"Message:\n%s",m->msg);
220
221 if(m->maplore!=NULL)
222 LOG(llevError,"Lore:\n%s",m->maplore);
220 223
221 if(m->tmpname!=NULL) 224 if(m->tmpname!=NULL)
222 LOG(llevError,"Tmpname: %s\n",m->tmpname); 225 LOG(llevError,"Tmpname: %s\n",m->tmpname);
223 226
224 LOG(llevError,"Difficulty: %d\n",m->difficulty); 227 LOG(llevError,"Difficulty: %d\n",m->difficulty);
… …
304 * go further. Not true for players - all sorts of special 307 * go further. Not true for players - all sorts of special
305 * things we need to do for players. 308 * things we need to do for players.
306 */ 309 */
307 if (ob->type != PLAYER && ! (mflags & P_IS_ALIVE) && (blocked==0)) return 0; 310 if (ob->type != PLAYER && ! (mflags & P_IS_ALIVE) && (blocked==0)) return 0;
308 311
312 /* if there isn't anytyhing alive on this space, and this space isn't
313 * otherwise blocked, we can return now. Only if there is a living
314 * creature do we need to investigate if it is part of this creature
315 * or another. Likewise, only if something is blocking us do we
316 * need to investigate if there is a special circumstance that would
317 * let the player through (inventory checkers for example)
318 */
319 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0;
309 320
310 if(ob->head != NULL) 321 if(ob->head != NULL)
311 ob=ob->head; 322 ob=ob->head;
312 323
313 /* We basically go through the stack of objects, and if there is 324 /* We basically go through the stack of objects, and if there is
… …
381 * Note this used to be arch_blocked, but with new movement 392 * Note this used to be arch_blocked, but with new movement
382 * code, we need to have actual object to check its move_type 393 * code, we need to have actual object to check its move_type
383 * against the move_block values. 394 * against the move_block values.
384 */ 395 */
385 396
386int ob_blocked(object *ob,mapstruct *m,sint16 x,sint16 y) { 397int ob_blocked(const object *ob,mapstruct *m,sint16 x,sint16 y) {
387 archetype *tmp; 398 archetype *tmp;
388 int flag; 399 int flag;
389 mapstruct *m1; 400 mapstruct *m1;
390 sint16 sx, sy; 401 sint16 sx, sy;
391 402
… …
401 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy); 412 flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy);
402 413
403 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; 414 if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP;
404 if (flag & P_IS_ALIVE) return P_IS_ALIVE; 415 if (flag & P_IS_ALIVE) return P_IS_ALIVE;
405 416
417 /* find_first_free_spot() calls this function. However, often
418 * ob doesn't have any move type (when used to place exits)
419 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
420 */
421
422 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue;
423
406 /* Note it is intentional that we check ob - the movement type of the 424 /* Note it is intentional that we check ob - the movement type of the
407 * head of the object should correspond for the entire object. 425 * head of the object should correspond for the entire object.
408 */ 426 */
409
410 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy))) 427 if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy)))
411 return AB_NO_PASS; 428 return AB_NO_PASS;
412 429
413 } 430 }
414 return 0; 431 return 0;
… …
778 * return 0 on success, 1 on failure. 795 * return 0 on success, 1 on failure.
779 */ 796 */
780 797
781static int load_map_header(FILE *fp, mapstruct *m) 798static int load_map_header(FILE *fp, mapstruct *m)
782{ 799{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], *key=NULL, *value, *end; 800 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key=NULL, *value, *end;
784 int msgpos=0; 801 int msgpos=0;
802 int maplorepos=0;
785 803
786 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { 804 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
787 buf[HUGE_BUF-1] = 0; 805 buf[HUGE_BUF-1] = 0;
788 key = buf; 806 key = buf;
789 while (isspace(*key)) key++; 807 while (isspace(*key)) key++;
… …
843 * keep the empty message. Also, msgbuf contains garbage data 861 * keep the empty message. Also, msgbuf contains garbage data
844 * when msgpos is zero, so copying it results in crashes 862 * when msgpos is zero, so copying it results in crashes
845 */ 863 */
846 if (msgpos != 0) 864 if (msgpos != 0)
847 m->msg = strdup_local(msgbuf); 865 m->msg = strdup_local(msgbuf);
866 }
867 else if (!strcmp(key,"maplore")) {
868 while (fgets(buf, HUGE_BUF-1, fp)!=NULL) {
869 if (!strcmp(buf,"endmaplore\n")) break;
870 else {
871 /* slightly more efficient than strcat */
872 strcpy(maplorebuf+maplorepos, buf);
873 maplorepos += strlen(buf);
874 }
875 }
876 if (maplorepos != 0)
877 m->maplore = strdup_local(maplorebuf);
848 } 878 }
849 else if (!strcmp(key,"end")) { 879 else if (!strcmp(key,"end")) {
850 break; 880 break;
851 } 881 }
852 else if (value == NULL) { 882 else if (value == NULL) {
… …
1259 if (m->width) fprintf(fp,"width %d\n", m->width); 1289 if (m->width) fprintf(fp,"width %d\n", m->width);
1260 if (m->height) fprintf(fp,"height %d\n", m->height); 1290 if (m->height) fprintf(fp,"height %d\n", m->height);
1261 if (m->enter_x) fprintf(fp,"enter_x %d\n", m->enter_x); 1291 if (m->enter_x) fprintf(fp,"enter_x %d\n", m->enter_x);
1262 if (m->enter_y) fprintf(fp,"enter_y %d\n", m->enter_y); 1292 if (m->enter_y) fprintf(fp,"enter_y %d\n", m->enter_y);
1263 if (m->msg) fprintf(fp,"msg\n%sendmsg\n", m->msg); 1293 if (m->msg) fprintf(fp,"msg\n%sendmsg\n", m->msg);
1294 if (m->maplore) fprintf(fp,"maplore\n%sendmaplore\n", m->maplore);
1264 if (m->unique) fprintf(fp,"unique %d\n", m->unique); 1295 if (m->unique) fprintf(fp,"unique %d\n", m->unique);
1265 if (m->template) fprintf(fp,"template %d\n", m->template); 1296 if (m->template) fprintf(fp,"template %d\n", m->template);
1266 if (m->outdoor) fprintf(fp,"outdoor %d\n", m->outdoor); 1297 if (m->outdoor) fprintf(fp,"outdoor %d\n", m->outdoor);
1267 if (m->temp) fprintf(fp, "temp %d\n", m->temp); 1298 if (m->temp) fprintf(fp, "temp %d\n", m->temp);
1268 if (m->pressure) fprintf(fp, "pressure %d\n", m->pressure); 1299 if (m->pressure) fprintf(fp, "pressure %d\n", m->pressure);
… …
1395 } 1426 }
1396 if (flag && m->spaces) free_all_objects(m); 1427 if (flag && m->spaces) free_all_objects(m);
1397 if (m->name) FREE_AND_CLEAR(m->name); 1428 if (m->name) FREE_AND_CLEAR(m->name);
1398 if (m->spaces) FREE_AND_CLEAR(m->spaces); 1429 if (m->spaces) FREE_AND_CLEAR(m->spaces);
1399 if (m->msg) FREE_AND_CLEAR(m->msg); 1430 if (m->msg) FREE_AND_CLEAR(m->msg);
1431 if (m->maplore) FREE_AND_CLEAR(m->maplore);
1400 if (m->shopitems) FREE_AND_CLEAR(m->shopitems); 1432 if (m->shopitems) FREE_AND_CLEAR(m->shopitems);
1401 if (m->shoprace) FREE_AND_CLEAR(m->shoprace); 1433 if (m->shoprace) FREE_AND_CLEAR(m->shoprace);
1402 if (m->buttons) 1434 if (m->buttons)
1403 free_objectlinkpt(m->buttons); 1435 free_objectlinkpt(m->buttons);
1404 m->buttons = NULL; 1436 m->buttons = NULL;
… …
1692void update_position (mapstruct *m, int x, int y) { 1724void update_position (mapstruct *m, int x, int y) {
1693 object *tmp, *last = NULL; 1725 object *tmp, *last = NULL;
1694 uint8 flags = 0, oldflags, light=0, anywhere=0; 1726 uint8 flags = 0, oldflags, light=0, anywhere=0;
1695 New_Face *top,*floor, *middle; 1727 New_Face *top,*floor, *middle;
1696 object *top_obj, *floor_obj, *middle_obj; 1728 object *top_obj, *floor_obj, *middle_obj;
1697 MoveType move_block=0, move_slow=0, move_on=0, move_off=0; 1729 MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0;
1698 1730
1699 oldflags = GET_MAP_FLAGS(m,x,y); 1731 oldflags = GET_MAP_FLAGS(m,x,y);
1700 if (!(oldflags & P_NEED_UPDATE)) { 1732 if (!(oldflags & P_NEED_UPDATE)) {
1701 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", 1733 LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n",
1702 m->path, x, y); 1734 m->path, x, y);
… …
1765 1797
1766 move_slow |= tmp->move_slow; 1798 move_slow |= tmp->move_slow;
1767 move_block |= tmp->move_block; 1799 move_block |= tmp->move_block;
1768 move_on |= tmp->move_on; 1800 move_on |= tmp->move_on;
1769 move_off |= tmp->move_off; 1801 move_off |= tmp->move_off;
1802 move_allow |= tmp->move_allow;
1770 1803
1771 if (QUERY_FLAG(tmp,FLAG_ALIVE)) 1804 if (QUERY_FLAG(tmp,FLAG_ALIVE))
1772 flags |= P_IS_ALIVE; 1805 flags |= P_IS_ALIVE;
1773 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) 1806 if (QUERY_FLAG(tmp,FLAG_NO_MAGIC))
1774 flags |= P_NO_MAGIC; 1807 flags |= P_NO_MAGIC;
… …
1788 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1821 LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1789 m->path, x, y, 1822 m->path, x, y,
1790 (oldflags & ~P_NEED_UPDATE), flags); 1823 (oldflags & ~P_NEED_UPDATE), flags);
1791 } 1824 }
1792 SET_MAP_FLAGS(m, x, y, flags); 1825 SET_MAP_FLAGS(m, x, y, flags);
1793 SET_MAP_MOVE_BLOCK(m, x, y, move_block); 1826 SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow);
1794 SET_MAP_MOVE_ON(m, x, y, move_on); 1827 SET_MAP_MOVE_ON(m, x, y, move_on);
1795 SET_MAP_MOVE_OFF(m, x, y, move_off); 1828 SET_MAP_MOVE_OFF(m, x, y, move_off);
1796 SET_MAP_MOVE_SLOW(m, x, y, move_slow); 1829 SET_MAP_MOVE_SLOW(m, x, y, move_slow);
1797 1830
1798 /* At this point, we have a floor face (if there is a floor), 1831 /* At this point, we have a floor face (if there is a floor),
… …
1918 * case. This generally shouldn't happen, but if the 1951 * case. This generally shouldn't happen, but if the
1919 * map loads fail below, it could happen. 1952 * map loads fail below, it could happen.
1920 */ 1953 */
1921 if (!m) return 0; 1954 if (!m) return 0;
1922 1955
1923 /* Simple case - coordinates are within this local
1924 * map.
1925 */
1926 if ( x>=0 && x<MAP_WIDTH(m) && y>=0 && y < MAP_HEIGHT(m))
1927 return 0;
1928
1929 if (x<0) { 1956 if (x<0) {
1930 if (!m->tile_path[3]) return 1; 1957 if (!m->tile_path[3]) return 1;
1931 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) { 1958 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) {
1932 load_and_link_tiled_map(m, 3); 1959 load_and_link_tiled_map(m, 3);
1933 } 1960 }
… …
1952 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) { 1979 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) {
1953 load_and_link_tiled_map(m, 2); 1980 load_and_link_tiled_map(m, 2);
1954 } 1981 }
1955 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m))); 1982 return (out_of_map(m->tile_map[2], x, y - MAP_HEIGHT(m)));
1956 } 1983 }
1984
1985 /* Simple case - coordinates are within this local
1986 * map.
1987 */
1957 return 1; 1988 return 0;
1958} 1989}
1959 1990
1960/* This is basically the same as out_of_map above, but 1991/* This is basically the same as out_of_map above, but
1961 * instead we return NULL if no map is valid (coordinates 1992 * instead we return NULL if no map is valid (coordinates
1962 * out of bounds and no tiled map), otherwise it returns 1993 * out of bounds and no tiled map), otherwise it returns
… …
1966 * and then figuring out what the real map is 1997 * and then figuring out what the real map is
1967 */ 1998 */
1968mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) 1999mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y)
1969{ 2000{
1970 2001
1971 /* Simple case - coordinates are within this local
1972 * map.
1973 */
1974
1975 if (*x>=0 && *x<MAP_WIDTH(m) && *y>=0 && *y < MAP_HEIGHT(m))
1976 return m;
1977
1978 if (*x<0) { 2002 if (*x<0) {
1979 if (!m->tile_path[3]) return NULL; 2003 if (!m->tile_path[3]) return NULL;
1980 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2004 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1981 load_and_link_tiled_map(m, 3); 2005 load_and_link_tiled_map(m, 3);
1982 2006
… …
2005 load_and_link_tiled_map(m, 2); 2029 load_and_link_tiled_map(m, 2);
2006 2030
2007 *y -= MAP_HEIGHT(m); 2031 *y -= MAP_HEIGHT(m);
2008 return (get_map_from_coord(m->tile_map[2], x, y)); 2032 return (get_map_from_coord(m->tile_map[2], x, y));
2009 } 2033 }
2010 return NULL; /* Shouldn't get here */
2011}
2012 2034
2035 /* Simple case - coordinates are within this local
2036 * map.
2037 */
2038
2039 return m;
2040}
2041
2042/**
2013// return wether map2 is adjacent to map1 and store their distance 2043 * Return whether map2 is adjacent to map1. If so, store the distance from
2014// in dx/dy if yes. 2044 * map1 to map2 in dx/dy.
2045 */
2015static int adjacent_map (mapstruct *map1, mapstruct *map2, int *dx, int *dy) 2046static int adjacent_map(const mapstruct *map1, const mapstruct *map2, int *dx, int *dy) {
2016{
2017 if (!map1 || !map2) 2047 if (!map1 || !map2)
2018 return 0; 2048 return 0;
2019 2049
2020 else if (map1 == map2) 2050 if (map1 == map2) {
2051 *dx = 0;
2021 *dx = *dy = 0; 2052 *dy = 0;
2022 2053
2023 else if (map1->tile_map[0] == map2) // up 2054 } else if (map1->tile_map[0] == map2) { /* up */
2055 *dx = 0;
2024 (*dx = 0), (*dy = -MAP_HEIGHT (map2)); 2056 *dy = -MAP_HEIGHT(map2);
2025 else if (map1->tile_map[1] == map2) // right 2057 } else if (map1->tile_map[1] == map2) { /* right */
2026 (*dx = MAP_WIDTH (map2)), (*dy = 0); 2058 *dx = MAP_WIDTH(map1);
2059 *dy = 0;
2027 else if (map1->tile_map[2] == map2) // down 2060 } else if (map1->tile_map[2] == map2) { /* down */
2028 (*dx = 0), (*dy = MAP_HEIGHT (map2)); 2061 *dx = 0;
2062 *dy = MAP_HEIGHT(map1);
2029 else if (map1->tile_map[3] == map2) // left 2063 } else if (map1->tile_map[3] == map2) { /* left */
2030 (*dx = -MAP_WIDTH (map2)), (*dy = 0); 2064 *dx = -MAP_WIDTH(map2);
2065 *dy = 0;
2031 2066
2032 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) // up right 2067 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) { /* up right */
2033 (*dx = MAP_WIDTH (map2)), (*dy = -MAP_HEIGHT (map1->tile_map[0])); 2068 *dx = MAP_WIDTH(map1->tile_map[0]);
2069 *dy = -MAP_HEIGHT(map1->tile_map[0]);
2034 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) // up left 2070 } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) { /* up left */
2035 (*dx = -MAP_WIDTH (map2)), (*dy = -MAP_HEIGHT (map1->tile_map[0])); 2071 *dx = -MAP_WIDTH(map2);
2072 *dy = -MAP_HEIGHT(map1->tile_map[0]);
2036 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) // right up 2073 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) { /* right up */
2037 (*dx = MAP_HEIGHT (map1->tile_map[1])), (*dy = -MAP_WIDTH (map2)); 2074 *dx = MAP_WIDTH(map1);
2075 *dy = -MAP_HEIGHT(map2);
2038 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) // right down 2076 } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) { /* right down */
2039 (*dx = MAP_HEIGHT (map1->tile_map[1])), (*dy = MAP_WIDTH (map2)); 2077 *dx = MAP_WIDTH(map1);
2078 *dy = MAP_HEIGHT(map1->tile_map[1]);
2040 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) // down right 2079 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) { /* down right */
2041 (*dx = MAP_WIDTH (map2)), (*dy = MAP_HEIGHT (map1->tile_map[2])); 2080 *dx = MAP_WIDTH(map1->tile_map[2]);
2081 *dy = MAP_HEIGHT(map1);
2042 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) // down left 2082 } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) { /* down left */
2043 (*dx = -MAP_WIDTH (map2)), (*dy = MAP_HEIGHT (map1->tile_map[2])); 2083 *dx = -MAP_WIDTH(map2);
2084 *dy = MAP_HEIGHT(map1);
2044 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) // left up 2085 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) { /* left up */
2045 (*dx = -MAP_HEIGHT (map1->tile_map[3])), (*dy = -MAP_WIDTH (map2)); 2086 *dx = -MAP_WIDTH(map1->tile_map[3]);
2087 *dy = -MAP_HEIGHT(map2);
2046 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) // left down 2088 } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) { /* left down */
2047 (*dx = MAP_HEIGHT (map1->tile_map[3])), (*dy = MAP_WIDTH (map2)); 2089 *dx = -MAP_WIDTH(map1->tile_map[3]);
2090 *dy = MAP_HEIGHT(map1->tile_map[3]);
2048 2091
2049 else // not "adjacent" enough 2092 } else { /* not "adjacent" enough */
2093 return 0;
2094 }
2095
2050 return 0; 2096 return 1;
2051
2052 return 1;
2053} 2097}
2054 2098
2055/* From map.c 2099/* From map.c
2056 * This is used by get_player to determine where the other 2100 * This is used by get_player to determine where the other
2057 * creature is. get_rangevector takes into account map tiling, 2101 * creature is. get_rangevector takes into account map tiling,
… …
2071 * 2115 *
2072 * currently, the only flag supported (0x1) is don't translate for 2116 * currently, the only flag supported (0x1) is don't translate for
2073 * closest body part of 'op1' 2117 * closest body part of 'op1'
2074 */ 2118 */
2075 2119
2076void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) 2120void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) {
2077{
2078 if (!adjacent_map (op1->map, op2->map, &(retval->distance_x), &(retval->distance_y))) 2121 if (!adjacent_map(op1->map, op2->map, &retval->distance_x, &retval->distance_y)) {
2079 {
2080 // be conservative and fill in _some_ data 2122 /* be conservative and fill in _some_ data */
2081 retval->distance = 100000; 2123 retval->distance = 100000;
2082 retval->distance_x = 32767; 2124 retval->distance_x = 32767;
2083 retval->distance_y = 32767; 2125 retval->distance_y = 32767;
2084 retval->direction = 0; 2126 retval->direction = 0;
2085 retval->part = 0; 2127 retval->part = 0;
2086 }
2087 else 2128 } else {
2088 {
2089 object *best; 2129 object *best;
2090 2130
2091 retval->distance_x += op2->x - op1->x; 2131 retval->distance_x += op2->x-op1->x;
2092 retval->distance_y += op2->y - op1->y; 2132 retval->distance_y += op2->y-op1->y;
2093 2133
2094 best = op1; 2134 best = op1;
2095 /* If this is multipart, find the closest part now */ 2135 /* If this is multipart, find the closest part now */
2096 if (!(flags & 0x1) && op1->more) { 2136 if (!(flags&0x1) && op1->more) {
2097 object *tmp; 2137 object *tmp;
2098 int best_distance = retval->distance_x * retval->distance_x + 2138 int best_distance = retval->distance_x*retval->distance_x+
2099 retval->distance_y * retval->distance_y, tmpi; 2139 retval->distance_y*retval->distance_y, tmpi;
2100 2140
2101 /* we just tkae the offset of the piece to head to figure 2141 /* we just take the offset of the piece to head to figure
2102 * distance instead of doing all that work above again 2142 * distance instead of doing all that work above again
2103 * since the distance fields we set above are positive in the 2143 * since the distance fields we set above are positive in the
2104 * same axis as is used for multipart objects, the simply arithemetic 2144 * same axis as is used for multipart objects, the simply arithmetic
2105 * below works. 2145 * below works.
2106 */ 2146 */
2107 for (tmp=op1->more; tmp; tmp=tmp->more) { 2147 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) {
2108 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 2148 tmpi = (op1->x-tmp->x+retval->distance_x)*(op1->x-tmp->x+retval->distance_x)+
2109 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 2149 (op1->y-tmp->y+retval->distance_y)*(op1->y-tmp->y+retval->distance_y);
2110 if (tmpi < best_distance) { 2150 if (tmpi < best_distance) {
2111 best_distance = tmpi; 2151 best_distance = tmpi;
2112 best = tmp; 2152 best = tmp;
2113 } 2153 }
2114 } 2154 }
2115 if (best != op1) { 2155 if (best != op1) {
2116 retval->distance_x += op1->x - best->x; 2156 retval->distance_x += op1->x-best->x;
2117 retval->distance_y += op1->y - best->y; 2157 retval->distance_y += op1->y-best->y;
2118 } 2158 }
2119 } 2159 }
2120 retval->part = best; 2160 retval->part = best;
2121 retval->distance = isqrt(retval->distance_x*retval->distance_x + retval->distance_y*retval->distance_y); 2161 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y);
2122 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2162 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y);
2123 } 2163 }
2124} 2164}
2125 2165
2126/* this is basically the same as get_rangevector above, but instead of 2166/* this is basically the same as get_rangevector above, but instead of
2127 * the first parameter being an object, it instead is the map 2167 * the first parameter being an object, it instead is the map
2128 * and x,y coordinates - this is used for path to player - 2168 * and x,y coordinates - this is used for path to player -
… …
2132 * be more consistant with the above function and also in case they are needed 2172 * be more consistant with the above function and also in case they are needed
2133 * for something in the future. Also, since no object is pasted, the best 2173 * for something in the future. Also, since no object is pasted, the best
2134 * field of the rv_vector is set to NULL. 2174 * field of the rv_vector is set to NULL.
2135 */ 2175 */
2136 2176
2137void get_rangevector_from_mapcoord(mapstruct *m, int x, int y, object *op2, rv_vector *retval,int flags) 2177void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags) {
2138{
2139 if (!adjacent_map (m, op2->map, &(retval->distance_x), &(retval->distance_y))) 2178 if (!adjacent_map(m, op2->map, &retval->distance_x, &retval->distance_y)) {
2140 {
2141 // be conservative and fill in _some_ data 2179 /* be conservative and fill in _some_ data */
2142 retval->distance = 100000; 2180 retval->distance = 100000;
2143 retval->distance_x = 32767; 2181 retval->distance_x = 32767;
2144 retval->distance_y = 32767; 2182 retval->distance_y = 32767;
2145 retval->direction = 0; 2183 retval->direction = 0;
2146 retval->part = 0; 2184 retval->part = 0;
2147 }
2148 else 2185 } else {
2149 {
2150 retval->distance_x += op2->x - x; 2186 retval->distance_x += op2->x-x;
2151 retval->distance_y += op2->y - y; 2187 retval->distance_y += op2->y-y;
2152 2188
2153 retval->part = NULL; 2189 retval->part = NULL;
2154 retval->distance = isqrt(retval->distance_x*retval->distance_x + retval->distance_y*retval->distance_y); 2190 retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y);
2155 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); 2191 retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y);
2156 } 2192 }
2157} 2193}
2158 2194
2159/* Returns true of op1 and op2 are effectively on the same map 2195/* Returns true of op1 and op2 are effectively on the same map
2160 * (as related to map tiling). Note that this looks for a path from 2196 * (as related to map tiling). Note that this looks for a path from
2161 * op1 to op2, so if the tiled maps are assymetric and op2 has a path 2197 * op1 to op2, so if the tiled maps are assymetric and op2 has a path
2162 * to op1, this will still return false. 2198 * to op1, this will still return false.
2163 * Note we only look one map out to keep the processing simple 2199 * Note we only look one map out to keep the processing simple
2164 * and efficient. This could probably be a macro. 2200 * and efficient. This could probably be a macro.
2165 * MSW 2001-08-05 2201 * MSW 2001-08-05
2166 */ 2202 */
2167int on_same_map(object *op1, object *op2) 2203int on_same_map(const object *op1, const object *op2) {
2168{
2169 int dx, dy; 2204 int dx, dy;
2170 2205
2171 return adjacent_map (op1->map, op2->map, &dx, &dy); 2206 return adjacent_map(op1->map, op2->map, &dx, &dy);
2172} 2207}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines