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.47 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.52 by root, Tue Dec 26 20:04:09 2006 UTC

… …
32 32
33/* 33/*
34 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
35 * return NULL if no match is found. 35 * return NULL if no match is found.
36 */ 36 */
37
38maptile * 37maptile *
39has_been_loaded (const char *name) 38has_been_loaded (const char *name)
40{ 39{
41 maptile *map; 40 maptile *map;
42 41
43 if (!name || !*name) 42 if (!name || !*name)
44 return 0; 43 return 0;
44
45 for (map = first_map; map; map = map->next) 45 for (map = first_map; map; map = map->next)
46 if (!strcmp (name, map->path)) 46 if (!strcmp (name, map->path))
47 break; 47 break;
48
48 return (map); 49 return (map);
49} 50}
50 51
51/* 52/*
52 * This makes a path absolute outside the world of Crossfire. 53 * This makes a path absolute outside the world of Crossfire.
… …
196 197
197void 198void
198dump_map (const maptile *m) 199dump_map (const maptile *m)
199{ 200{
200 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
201 LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); 202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
202 203
203 if (m->msg != NULL) 204 if (m->msg != NULL)
204 LOG (llevError, "Message:\n%s", m->msg); 205 LOG (llevError, "Message:\n%s", m->msg);
205 206
206 if (m->maplore != NULL) 207 if (m->maplore != NULL)
… …
483{ 484{
484 int x, y; 485 int x, y;
485 object *tmp, *op, *last, *above; 486 object *tmp, *op, *last, *above;
486 archetype *at; 487 archetype *at;
487 488
488 for (x = 0; x < MAP_WIDTH (m); x++) 489 for (x = 0; x < m->width; x++)
489 for (y = 0; y < MAP_HEIGHT (m); y++) 490 for (y = 0; y < m->height; y++)
490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) 491 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
491 { 492 {
492 above = tmp->above; 493 above = tmp->above;
493 494
494 /* already multipart - don't do anything more */ 495 /* already multipart - don't do anything more */
… …
600 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 601 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
601 * and we only save the head of multi part objects - this is needed 602 * and we only save the head of multi part objects - this is needed
602 * in order to do map tiling properly. 603 * in order to do map tiling properly.
603 */ 604 */
604void 605void
605save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 606save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
606{ 607{
607 int i, j = 0, unique = 0; 608 int i, j = 0, unique = 0;
608 object *op; 609 object *op;
609 610
610 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
611 for (i = 0; i < MAP_WIDTH (m); i++) 612 for (i = 0; i < m->width; i++)
612 for (j = 0; j < MAP_HEIGHT (m); j++) 613 for (j = 0; j < m->height; j++)
613 { 614 {
614 unique = 0; 615 unique = 0;
616
615 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 617 for (op = m->at (i, j).bot; op; op = op->above)
616 { 618 {
617 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 619 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
618 unique = 1; 620 unique = 1;
619 621
620 if (op->type == PLAYER) 622 if (op->type == PLAYER)
621 continue; 623 continue;
622 624
623 if (op->head || op->owner) 625 if (op->head || op->owner)
624 continue; 626 continue;
625 627
626 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 628 if (unique || op->flag [FLAG_UNIQUE])
627 save_object (fp2, op, 3); 629 save_object (fp2, op, 1);
628 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 630 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
629 save_object (fp, op, 3); 631 save_object (fp, op, 1);
630 } 632 }
631 } 633 }
632} 634}
633 635
634maptile::maptile () 636maptile::maptile ()
635{ 637{
636 in_memory = MAP_SWAPPED; 638 in_memory = MAP_SWAPPED;
637 /* The maps used to pick up default x and y values from the 639 /* The maps used to pick up default x and y values from the
638 * map archetype. Mimic that behaviour. 640 * map archetype. Mimic that behaviour.
639 */ 641 */
640 MAP_WIDTH (this) = 16; 642 this->width = 16;
641 MAP_HEIGHT (this) = 16; 643 this->height = 16;
642 MAP_RESET_TIMEOUT (this) = 0; 644 this->reset_timeout = 0;
643 MAP_TIMEOUT (this) = 300; 645 this->timeout = 300;
644 MAP_ENTER_X (this) = 0; 646 this->enter_x = 0;
645 MAP_ENTER_Y (this) = 0; 647 this->enter_y = 0;
646 /*set part to -1 indicating conversion to weather map not yet done */ 648 /*set part to -1 indicating conversion to weather map not yet done */
647 MAP_WORLDPARTX (this) = -1; 649 this->worldpartx = -1;
648 MAP_WORLDPARTY (this) = -1; 650 this->worldparty = -1;
649} 651}
650 652
651/* 653/*
652 * Allocates, initialises, and returns a pointer to a maptile. 654 * Allocates, initialises, and returns a pointer to a maptile.
653 * Modified to no longer take a path option which was not being 655 * Modified to no longer take a path option which was not being
… …
1132 1134
1133 m->in_memory = MAP_LOADING; 1135 m->in_memory = MAP_LOADING;
1134 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1136 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1135 1137
1136 m->in_memory = MAP_IN_MEMORY; 1138 m->in_memory = MAP_IN_MEMORY;
1137 if (!MAP_DIFFICULTY (m)) 1139 if (!m->difficulty)
1138 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1140 m->difficulty = calculate_difficulty (m);
1139 set_map_reset_time (m); 1141 set_map_reset_time (m);
1140 m->instantiate (); 1142 m->instantiate ();
1141 return (m); 1143 return (m);
1142} 1144}
1143 1145
… …
1238delete_unique_items (maptile *m) 1240delete_unique_items (maptile *m)
1239{ 1241{
1240 int i, j, unique; 1242 int i, j, unique;
1241 object *op, *next; 1243 object *op, *next;
1242 1244
1243 for (i = 0; i < MAP_WIDTH (m); i++) 1245 for (i = 0; i < m->width; i++)
1244 for (j = 0; j < MAP_HEIGHT (m); j++) 1246 for (j = 0; j < m->height; j++)
1245 { 1247 {
1246 unique = 0; 1248 unique = 0;
1247 1249
1248 for (op = GET_MAP_OB (m, i, j); op; op = next) 1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1249 { 1251 {
… …
1288 return; 1290 return;
1289 1291
1290 m->in_memory = MAP_LOADING; 1292 m->in_memory = MAP_LOADING;
1291 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1293 if (m->tmpname == NULL) /* if we have loaded unique items from */
1292 delete_unique_items (m); /* original map before, don't duplicate them */ 1294 delete_unique_items (m); /* original map before, don't duplicate them */
1295
1293 load_objects (m, thawer, 0); 1296 load_objects (m, thawer, 0);
1294 1297
1295 m->in_memory = MAP_IN_MEMORY; 1298 m->in_memory = MAP_IN_MEMORY;
1296} 1299}
1297
1298 1300
1299/* 1301/*
1300 * Saves a map to file. If flag is set, it is saved into the same 1302 * Saves a map to file. If flag is set, it is saved into the same
1301 * file it was (originally) loaded from. Otherwise a temporary 1303 * file it was (originally) loaded from. Otherwise a temporary
1302 * filename will be genarated, and the file will be stored there. 1304 * filename will be genarated, and the file will be stored there.
1303 * The temporary filename will be stored in the maptileure. 1305 * The temporary filename will be stored in the maptileure.
1304 * If the map is unique, we also save to the filename in the map 1306 * If the map is unique, we also save to the filename in the map
1305 * (this should have been updated when first loaded) 1307 * (this should have been updated when first loaded)
1306 */ 1308 */
1307
1308int 1309int
1309new_save_map (maptile *m, int flag) 1310new_save_map (maptile *m, int flag)
1310{ 1311{
1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1312 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312 int i; 1313 int i;
… …
1453free_all_objects (maptile *m) 1454free_all_objects (maptile *m)
1454{ 1455{
1455 if (!m->spaces) 1456 if (!m->spaces)
1456 return; 1457 return;
1457 1458
1458 for (int i = 0; i < MAP_WIDTH (m); i++) 1459 for (int i = 0; i < m->width; i++)
1459 for (int j = 0; j < MAP_HEIGHT (m); j++) 1460 for (int j = 0; j < m->height; j++)
1460 { 1461 {
1461 mapspace &ms = m->at (i, j); 1462 mapspace &ms = m->at (i, j);
1462 1463
1463 while (object *op = ms.bottom) 1464 while (object *op = ms.bot)
1464 { 1465 {
1465 if (op->head) 1466 if (op->head)
1466 op = op->head; 1467 op = op->head;
1467 1468
1468 op->destroy_inv (false); 1469 op->destroy_inv (false);
… …
1476 * don't free tmpname - our caller is left to do that 1477 * don't free tmpname - our caller is left to do that
1477 */ 1478 */
1478void 1479void
1479free_map (maptile *m, int flag) 1480free_map (maptile *m, int flag)
1480{ 1481{
1481 if (m->in_memory != MAP_IN_MEMORY) 1482 if (!m->in_memory) //TODO: makes no sense to me?
1482 return; 1483 return;
1483 1484
1484 m->in_memory = MAP_SAVING; 1485 m->in_memory = MAP_SAVING;
1485 1486
1486 // TODO: use new/delete 1487 // TODO: use new/delete
1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1488 1488
1489 if (flag && m->spaces) 1489 if (flag && m->spaces)
1490 free_all_objects (m); 1490 free_all_objects (m);
1491 if (m->name)
1492 FREE_AND_CLEAR (m->name);
1493 if (m->spaces)
1494 FREE_AND_CLEAR (m->spaces);
1495 if (m->msg)
1496 FREE_AND_CLEAR (m->msg);
1497 if (m->maplore)
1498 FREE_AND_CLEAR (m->maplore);
1499 1491
1500 delete [] m->shopitems; 1492 free (m->name), m->name = 0;
1501 m->shopitems = 0; 1493 free (m->spaces), m->spaces = 0;
1502 1494 free (m->msg), m->msg = 0;
1503 if (m->shoprace) 1495 free (m->maplore), m->maplore = 0;
1504 FREE_AND_CLEAR (m->shoprace); 1496 free (m->shoprace), m->shoprace = 0;
1497 delete [] m->shopitems, m->shopitems = 0;
1505 1498
1506 if (m->buttons) 1499 if (m->buttons)
1507 free_objectlinkpt (m->buttons); 1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1508
1509 m->buttons = NULL;
1510 1501
1511 for (int i = 0; i < 4; i++) 1502 for (int i = 0; i < 4; i++)
1512 { 1503 {
1513 if (m->tile_path[i]) 1504 if (m->tile_path[i])
1514 FREE_AND_CLEAR (m->tile_path[i]); 1505 free (m->tile_path[i]), m->tile_path[i] = 0;
1515 1506
1516 m->tile_map[i] = 0; 1507 m->tile_map[i] = 0;
1517 } 1508 }
1518 1509
1519 m->in_memory = MAP_SWAPPED; 1510 m->in_memory = MAP_SWAPPED;
1520
1521#undef FREE_AND_CLEAR
1522} 1511}
1523 1512
1524maptile::~maptile () 1513maptile::~maptile ()
1525{ 1514{
1526 free_map (this, 1); 1515 free_map (this, 1);
… …
1692 int x, y, i; 1681 int x, y, i;
1693 long monster_cnt = 0; 1682 long monster_cnt = 0;
1694 double avgexp = 0; 1683 double avgexp = 0;
1695 sint64 total_exp = 0; 1684 sint64 total_exp = 0;
1696 1685
1697 if (MAP_DIFFICULTY (m)) 1686 if (m->difficulty)
1698 { 1687 {
1699 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1688 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1700 return MAP_DIFFICULTY (m); 1689 return m->difficulty;
1701 } 1690 }
1702 1691
1703 for (x = 0; x < MAP_WIDTH (m); x++) 1692 for (x = 0; x < m->width; x++)
1704 for (y = 0; y < MAP_HEIGHT (m); y++) 1693 for (y = 0; y < m->height; y++)
1705 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 1694 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1706 { 1695 {
1707 if (QUERY_FLAG (op, FLAG_MONSTER)) 1696 if (QUERY_FLAG (op, FLAG_MONSTER))
1708 { 1697 {
1709 total_exp += op->stats.exp; 1698 total_exp += op->stats.exp;
… …
1826 1815
1827 middle_obj = 0; 1816 middle_obj = 0;
1828 top_obj = 0; 1817 top_obj = 0;
1829 floor_obj = 0; 1818 floor_obj = 0;
1830 1819
1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) 1820 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1832 { 1821 {
1833 /* This could be made additive I guess (two lights better than 1822 /* This could be made additive I guess (two lights better than
1834 * one). But if so, it shouldn't be a simple additive - 2 1823 * one). But if so, it shouldn't be a simple additive - 2
1835 * light bulbs do not illuminate twice as far as once since 1824 * light bulbs do not illuminate twice as far as once since
1836 * it is a dissapation factor that is cubed. 1825 * it is a dissapation factor that is cubed.
… …
1986void 1975void
1987set_map_reset_time (maptile *map) 1976set_map_reset_time (maptile *map)
1988{ 1977{
1989 int timeout; 1978 int timeout;
1990 1979
1991 timeout = MAP_RESET_TIMEOUT (map); 1980 timeout = map->reset_timeout;
1992 if (timeout <= 0) 1981 if (timeout <= 0)
1993 timeout = MAP_DEFAULTRESET; 1982 timeout = MAP_DEFAULTRESET;
1994 if (timeout >= MAP_MAXRESET) 1983 if (timeout >= MAP_MAXRESET)
1995 timeout = MAP_MAXRESET; 1984 timeout = MAP_MAXRESET;
1996 MAP_WHEN_RESET (map) = time (0) + timeout; 1985 map->reset_time = time (0) + timeout;
1997} 1986}
1998 1987
1999/* this updates the orig_map->tile_map[tile_num] value after loading 1988/* this updates the orig_map->tile_map[tile_num] value after loading
2000 * the map. It also takes care of linking back the freshly loaded 1989 * the map. It also takes care of linking back the freshly loaded
2001 * maps tile_map values if it tiles back to this one. It returns 1990 * maps tile_map values if it tiles back to this one. It returns
… …
2044 return 1; 2033 return 1;
2045 2034
2046 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2035 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2047 load_and_link_tiled_map (m, 3); 2036 load_and_link_tiled_map (m, 3);
2048 2037
2049 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2038 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2050 } 2039 }
2051 2040
2052 if (x >= MAP_WIDTH (m)) 2041 if (x >= m->width)
2053 { 2042 {
2054 if (!m->tile_path[1]) 2043 if (!m->tile_path[1])
2055 return 1; 2044 return 1;
2056 2045
2057 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2046 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2058 load_and_link_tiled_map (m, 1); 2047 load_and_link_tiled_map (m, 1);
2059 2048
2060 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2049 return (out_of_map (m->tile_map[1], x - m->width, y));
2061 } 2050 }
2062 2051
2063 if (y < 0) 2052 if (y < 0)
2064 { 2053 {
2065 if (!m->tile_path[0]) 2054 if (!m->tile_path[0])
2066 return 1; 2055 return 1;
2067 2056
2068 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2057 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2069 load_and_link_tiled_map (m, 0); 2058 load_and_link_tiled_map (m, 0);
2070 2059
2071 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2060 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2072 } 2061 }
2073 2062
2074 if (y >= MAP_HEIGHT (m)) 2063 if (y >= m->height)
2075 { 2064 {
2076 if (!m->tile_path[2]) 2065 if (!m->tile_path[2])
2077 return 1; 2066 return 1;
2078 2067
2079 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2068 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2080 load_and_link_tiled_map (m, 2); 2069 load_and_link_tiled_map (m, 2);
2081 2070
2082 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2071 return (out_of_map (m->tile_map[2], x, y - m->height));
2083 } 2072 }
2084 2073
2085 /* Simple case - coordinates are within this local 2074 /* Simple case - coordinates are within this local
2086 * map. 2075 * map.
2087 */ 2076 */
… …
2105 if (!m->tile_path[3]) 2094 if (!m->tile_path[3])
2106 return 0; 2095 return 0;
2107 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2096 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2108 load_and_link_tiled_map (m, 3); 2097 load_and_link_tiled_map (m, 3);
2109 2098
2110 *x += MAP_WIDTH (m->tile_map[3]); 2099 *x += m->tile_map[3]->width;
2111 return (get_map_from_coord (m->tile_map[3], x, y)); 2100 return (get_map_from_coord (m->tile_map[3], x, y));
2112 } 2101 }
2113 2102
2114 if (*x >= MAP_WIDTH (m)) 2103 if (*x >= m->width)
2115 { 2104 {
2116 if (!m->tile_path[1]) 2105 if (!m->tile_path[1])
2117 return 0; 2106 return 0;
2118 2107
2119 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2108 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2120 load_and_link_tiled_map (m, 1); 2109 load_and_link_tiled_map (m, 1);
2121 2110
2122 *x -= MAP_WIDTH (m); 2111 *x -= m->width;
2123 return (get_map_from_coord (m->tile_map[1], x, y)); 2112 return (get_map_from_coord (m->tile_map[1], x, y));
2124 } 2113 }
2125 2114
2126 if (*y < 0) 2115 if (*y < 0)
2127 { 2116 {
… …
2129 return 0; 2118 return 0;
2130 2119
2131 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2120 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2132 load_and_link_tiled_map (m, 0); 2121 load_and_link_tiled_map (m, 0);
2133 2122
2134 *y += MAP_HEIGHT (m->tile_map[0]); 2123 *y += m->tile_map[0]->height;
2135 return (get_map_from_coord (m->tile_map[0], x, y)); 2124 return (get_map_from_coord (m->tile_map[0], x, y));
2136 } 2125 }
2137 2126
2138 if (*y >= MAP_HEIGHT (m)) 2127 if (*y >= m->height)
2139 { 2128 {
2140 if (!m->tile_path[2]) 2129 if (!m->tile_path[2])
2141 return 0; 2130 return 0;
2142 2131
2143 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2132 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2144 load_and_link_tiled_map (m, 2); 2133 load_and_link_tiled_map (m, 2);
2145 2134
2146 *y -= MAP_HEIGHT (m); 2135 *y -= m->height;
2147 return (get_map_from_coord (m->tile_map[2], x, y)); 2136 return (get_map_from_coord (m->tile_map[2], x, y));
2148 } 2137 }
2149 2138
2150 /* Simple case - coordinates are within this local 2139 /* Simple case - coordinates are within this local
2151 * map. 2140 * map.
… …
2171 2160
2172 } 2161 }
2173 else if (map1->tile_map[0] == map2) 2162 else if (map1->tile_map[0] == map2)
2174 { /* up */ 2163 { /* up */
2175 *dx = 0; 2164 *dx = 0;
2176 *dy = -MAP_HEIGHT (map2); 2165 *dy = -map2->height;
2177 } 2166 }
2178 else if (map1->tile_map[1] == map2) 2167 else if (map1->tile_map[1] == map2)
2179 { /* right */ 2168 { /* right */
2180 *dx = MAP_WIDTH (map1); 2169 *dx = map1->width;
2181 *dy = 0; 2170 *dy = 0;
2182 } 2171 }
2183 else if (map1->tile_map[2] == map2) 2172 else if (map1->tile_map[2] == map2)
2184 { /* down */ 2173 { /* down */
2185 *dx = 0; 2174 *dx = 0;
2186 *dy = MAP_HEIGHT (map1); 2175 *dy = map1->height;
2187 } 2176 }
2188 else if (map1->tile_map[3] == map2) 2177 else if (map1->tile_map[3] == map2)
2189 { /* left */ 2178 { /* left */
2190 *dx = -MAP_WIDTH (map2); 2179 *dx = -map2->width;
2191 *dy = 0; 2180 *dy = 0;
2192 2181
2193 } 2182 }
2194 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2183 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2195 { /* up right */ 2184 { /* up right */
2196 *dx = MAP_WIDTH (map1->tile_map[0]); 2185 *dx = map1->tile_map[0]->width;
2197 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2186 *dy = -map1->tile_map[0]->height;
2198 } 2187 }
2199 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2188 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2200 { /* up left */ 2189 { /* up left */
2201 *dx = -MAP_WIDTH (map2); 2190 *dx = -map2->width;
2202 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2191 *dy = -map1->tile_map[0]->height;
2203 } 2192 }
2204 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2193 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2205 { /* right up */ 2194 { /* right up */
2206 *dx = MAP_WIDTH (map1); 2195 *dx = map1->width;
2207 *dy = -MAP_HEIGHT (map2); 2196 *dy = -map2->height;
2208 } 2197 }
2209 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2198 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2210 { /* right down */ 2199 { /* right down */
2211 *dx = MAP_WIDTH (map1); 2200 *dx = map1->width;
2212 *dy = MAP_HEIGHT (map1->tile_map[1]); 2201 *dy = map1->tile_map[1]->height;
2213 } 2202 }
2214 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2203 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2215 { /* down right */ 2204 { /* down right */
2216 *dx = MAP_WIDTH (map1->tile_map[2]); 2205 *dx = map1->tile_map[2]->width;
2217 *dy = MAP_HEIGHT (map1); 2206 *dy = map1->height;
2218 } 2207 }
2219 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2208 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2220 { /* down left */ 2209 { /* down left */
2221 *dx = -MAP_WIDTH (map2); 2210 *dx = -map2->width;
2222 *dy = MAP_HEIGHT (map1); 2211 *dy = map1->height;
2223 } 2212 }
2224 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2213 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2225 { /* left up */ 2214 { /* left up */
2226 *dx = -MAP_WIDTH (map1->tile_map[3]); 2215 *dx = -map1->tile_map[3]->width;
2227 *dy = -MAP_HEIGHT (map2); 2216 *dy = -map2->height;
2228 } 2217 }
2229 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2218 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2230 { /* left down */ 2219 { /* left down */
2231 *dx = -MAP_WIDTH (map1->tile_map[3]); 2220 *dx = -map1->tile_map[3]->width;
2232 *dy = MAP_HEIGHT (map1->tile_map[3]); 2221 *dy = map1->tile_map[3]->height;
2233 2222
2234 } 2223 }
2235 else 2224 else
2236 { /* not "adjacent" enough */ 2225 { /* not "adjacent" enough */
2237 return 0; 2226 return 0;
… …
2362{ 2351{
2363 int dx, dy; 2352 int dx, dy;
2364 2353
2365 return adjacent_map (op1->map, op2->map, &dx, &dy); 2354 return adjacent_map (op1->map, op2->map, &dx, &dy);
2366} 2355}
2356
2357object *
2358maptile::insert (object *op, int x, int y, object *originator, int flags)
2359{
2360 if (!op->flag [FLAG_REMOVED])
2361 op->remove ();
2362
2363 return insert_ob_in_map_at (op, this, originator, flags, x, y);
2364}
2365

Diff Legend

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