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.48 by root, Mon Dec 25 14:43:22 2006 UTC vs.
Revision 1.50 by root, Mon Dec 25 15:28:35 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", m->width, m->height, 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)
… …
610 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
611 for (i = 0; i < m->width; i++) 612 for (i = 0; i < m->width; i++)
612 for (j = 0; j < m->height; j++) 613 for (j = 0; j < m->height; j++)
613 { 614 {
614 unique = 0; 615 unique = 0;
615 for (op = m->at (i, j).bottom; op; op = op->above) 616 for (op = m->at (i, j).bot; op; op = op->above)
616 { 617 {
617 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE]) 618 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
618 unique = 1; 619 unique = 1;
619 620
620 if (op->type == PLAYER) 621 if (op->type == PLAYER)
… …
637 /* The maps used to pick up default x and y values from the 638 /* The maps used to pick up default x and y values from the
638 * map archetype. Mimic that behaviour. 639 * map archetype. Mimic that behaviour.
639 */ 640 */
640 this->width = 16; 641 this->width = 16;
641 this->height = 16; 642 this->height = 16;
642 MAP_RESET_TIMEOUT (this) = 0; 643 this->reset_timeout = 0;
643 MAP_TIMEOUT (this) = 300; 644 this->timeout = 300;
644 MAP_ENTER_X (this) = 0; 645 this->enter_x = 0;
645 MAP_ENTER_Y (this) = 0; 646 this->enter_y = 0;
646 /*set part to -1 indicating conversion to weather map not yet done */ 647 /*set part to -1 indicating conversion to weather map not yet done */
647 MAP_WORLDPARTX (this) = -1; 648 this->worldpartx = -1;
648 MAP_WORLDPARTY (this) = -1; 649 this->worldparty = -1;
649} 650}
650 651
651/* 652/*
652 * Allocates, initialises, and returns a pointer to a maptile. 653 * Allocates, initialises, and returns a pointer to a maptile.
653 * Modified to no longer take a path option which was not being 654 * Modified to no longer take a path option which was not being
… …
1132 1133
1133 m->in_memory = MAP_LOADING; 1134 m->in_memory = MAP_LOADING;
1134 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1135 1136
1136 m->in_memory = MAP_IN_MEMORY; 1137 m->in_memory = MAP_IN_MEMORY;
1137 if (!MAP_DIFFICULTY (m)) 1138 if (!m->difficulty)
1138 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1139 m->difficulty = calculate_difficulty (m);
1139 set_map_reset_time (m); 1140 set_map_reset_time (m);
1140 m->instantiate (); 1141 m->instantiate ();
1141 return (m); 1142 return (m);
1142} 1143}
1143 1144
… …
1288 return; 1289 return;
1289 1290
1290 m->in_memory = MAP_LOADING; 1291 m->in_memory = MAP_LOADING;
1291 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1292 delete_unique_items (m); /* original map before, don't duplicate them */ 1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1293 load_objects (m, thawer, 0); 1295 load_objects (m, thawer, 0);
1294 1296
1295 m->in_memory = MAP_IN_MEMORY; 1297 m->in_memory = MAP_IN_MEMORY;
1296} 1298}
1297
1298 1299
1299/* 1300/*
1300 * Saves a map to file. If flag is set, it is saved into the same 1301 * 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 1302 * file it was (originally) loaded from. Otherwise a temporary
1302 * filename will be genarated, and the file will be stored there. 1303 * filename will be genarated, and the file will be stored there.
1303 * The temporary filename will be stored in the maptileure. 1304 * The temporary filename will be stored in the maptileure.
1304 * If the map is unique, we also save to the filename in the map 1305 * If the map is unique, we also save to the filename in the map
1305 * (this should have been updated when first loaded) 1306 * (this should have been updated when first loaded)
1306 */ 1307 */
1307
1308int 1308int
1309new_save_map (maptile *m, int flag) 1309new_save_map (maptile *m, int flag)
1310{ 1310{
1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312 int i; 1312 int i;
… …
1458 for (int i = 0; i < m->width; i++) 1458 for (int i = 0; i < m->width; i++)
1459 for (int j = 0; j < m->height; j++) 1459 for (int j = 0; j < m->height; j++)
1460 { 1460 {
1461 mapspace &ms = m->at (i, j); 1461 mapspace &ms = m->at (i, j);
1462 1462
1463 while (object *op = ms.bottom) 1463 while (object *op = ms.bot)
1464 { 1464 {
1465 if (op->head) 1465 if (op->head)
1466 op = op->head; 1466 op = op->head;
1467 1467
1468 op->destroy_inv (false); 1468 op->destroy_inv (false);
… …
1476 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1477 */ 1477 */
1478void 1478void
1479free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1480{ 1480{
1481 if (m->in_memory != MAP_IN_MEMORY) 1481 if (!m->in_memory) //TODO: makes no sense to me?
1482 return; 1482 return;
1483 1483
1484 m->in_memory = MAP_SAVING; 1484 m->in_memory = MAP_SAVING;
1485 1485
1486 // TODO: use new/delete 1486 // TODO: use new/delete
1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1488 1487
1489 if (flag && m->spaces) 1488 if (flag && m->spaces)
1490 free_all_objects (m); 1489 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 1490
1500 delete [] m->shopitems; 1491 free (m->name), m->name = 0;
1501 m->shopitems = 0; 1492 free (m->spaces), m->spaces = 0;
1502 1493 free (m->msg), m->msg = 0;
1503 if (m->shoprace) 1494 free (m->maplore), m->maplore = 0;
1504 FREE_AND_CLEAR (m->shoprace); 1495 free (m->shoprace), m->shoprace = 0;
1496 delete [] m->shopitems, m->shopitems = 0;
1505 1497
1506 if (m->buttons) 1498 if (m->buttons)
1507 free_objectlinkpt (m->buttons); 1499 free_objectlinkpt (m->buttons), m->buttons = 0;
1508
1509 m->buttons = NULL;
1510 1500
1511 for (int i = 0; i < 4; i++) 1501 for (int i = 0; i < 4; i++)
1512 { 1502 {
1513 if (m->tile_path[i]) 1503 if (m->tile_path[i])
1514 FREE_AND_CLEAR (m->tile_path[i]); 1504 free (m->tile_path[i]), m->tile_path[i] = 0;
1515 1505
1516 m->tile_map[i] = 0; 1506 m->tile_map[i] = 0;
1517 } 1507 }
1518 1508
1519 m->in_memory = MAP_SWAPPED; 1509 m->in_memory = MAP_SWAPPED;
1520
1521#undef FREE_AND_CLEAR
1522} 1510}
1523 1511
1524maptile::~maptile () 1512maptile::~maptile ()
1525{ 1513{
1526 free_map (this, 1); 1514 free_map (this, 1);
… …
1692 int x, y, i; 1680 int x, y, i;
1693 long monster_cnt = 0; 1681 long monster_cnt = 0;
1694 double avgexp = 0; 1682 double avgexp = 0;
1695 sint64 total_exp = 0; 1683 sint64 total_exp = 0;
1696 1684
1697 if (MAP_DIFFICULTY (m)) 1685 if (m->difficulty)
1698 { 1686 {
1699 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1687 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1700 return MAP_DIFFICULTY (m); 1688 return m->difficulty;
1701 } 1689 }
1702 1690
1703 for (x = 0; x < m->width; x++) 1691 for (x = 0; x < m->width; x++)
1704 for (y = 0; y < m->height; y++) 1692 for (y = 0; y < m->height; y++)
1705 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 1693 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
… …
1826 1814
1827 middle_obj = 0; 1815 middle_obj = 0;
1828 top_obj = 0; 1816 top_obj = 0;
1829 floor_obj = 0; 1817 floor_obj = 0;
1830 1818
1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) 1819 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1832 { 1820 {
1833 /* This could be made additive I guess (two lights better than 1821 /* This could be made additive I guess (two lights better than
1834 * one). But if so, it shouldn't be a simple additive - 2 1822 * one). But if so, it shouldn't be a simple additive - 2
1835 * light bulbs do not illuminate twice as far as once since 1823 * light bulbs do not illuminate twice as far as once since
1836 * it is a dissapation factor that is cubed. 1824 * it is a dissapation factor that is cubed.
… …
1986void 1974void
1987set_map_reset_time (maptile *map) 1975set_map_reset_time (maptile *map)
1988{ 1976{
1989 int timeout; 1977 int timeout;
1990 1978
1991 timeout = MAP_RESET_TIMEOUT (map); 1979 timeout = map->reset_timeout;
1992 if (timeout <= 0) 1980 if (timeout <= 0)
1993 timeout = MAP_DEFAULTRESET; 1981 timeout = MAP_DEFAULTRESET;
1994 if (timeout >= MAP_MAXRESET) 1982 if (timeout >= MAP_MAXRESET)
1995 timeout = MAP_MAXRESET; 1983 timeout = MAP_MAXRESET;
1996 MAP_WHEN_RESET (map) = time (0) + timeout; 1984 map->reset_time = time (0) + timeout;
1997} 1985}
1998 1986
1999/* this updates the orig_map->tile_map[tile_num] value after loading 1987/* 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 1988 * 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 1989 * maps tile_map values if it tiles back to this one. It returns

Diff Legend

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