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.46 by root, Wed Dec 20 11:36:38 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", 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)
… …
409 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 410 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
410 if (flag & P_OUT_OF_MAP) 411 if (flag & P_OUT_OF_MAP)
411 return P_OUT_OF_MAP; 412 return P_OUT_OF_MAP;
412 413
413 /* don't have object, so don't know what types would block */ 414 /* don't have object, so don't know what types would block */
414 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 415 return m1->at (sx, sy).move_block;
415 } 416 }
416 417
417 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 418 for (tmp = ob->arch; tmp; tmp = tmp->more)
418 { 419 {
419 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 420 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
420 421
421 if (flag & P_OUT_OF_MAP) 422 if (flag & P_OUT_OF_MAP)
422 return P_OUT_OF_MAP; 423 return P_OUT_OF_MAP;
423 if (flag & P_IS_ALIVE) 424 if (flag & P_IS_ALIVE)
424 return P_IS_ALIVE; 425 return P_IS_ALIVE;
425 426
427 mapspace &ms = m1->at (sx, sy);
428
429
426 /* find_first_free_spot() calls this function. However, often 430 /* find_first_free_spot() calls this function. However, often
427 * ob doesn't have any move type (when used to place exits) 431 * ob doesn't have any move type (when used to place exits)
428 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 432 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
429 */ 433 */
430 434
431 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 435 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
432 continue; 436 continue;
433 437
434 /* Note it is intentional that we check ob - the movement type of the 438 /* Note it is intentional that we check ob - the movement type of the
435 * head of the object should correspond for the entire object. 439 * head of the object should correspond for the entire object.
436 */ 440 */
437 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 441 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
438 return P_NO_PASS; 442 return P_NO_PASS;
439 } 443 }
440 444
441 return 0; 445 return 0;
442} 446}
… …
480{ 484{
481 int x, y; 485 int x, y;
482 object *tmp, *op, *last, *above; 486 object *tmp, *op, *last, *above;
483 archetype *at; 487 archetype *at;
484 488
485 for (x = 0; x < MAP_WIDTH (m); x++) 489 for (x = 0; x < m->width; x++)
486 for (y = 0; y < MAP_HEIGHT (m); y++) 490 for (y = 0; y < m->height; y++)
487 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)
488 { 492 {
489 above = tmp->above; 493 above = tmp->above;
490 494
491 /* already multipart - don't do anything more */ 495 /* already multipart - don't do anything more */
… …
542 { 546 {
543 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 547 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
544 continue; 548 continue;
545 } 549 }
546 550
547
548 switch (i) 551 switch (i)
549 { 552 {
550 case LL_NORMAL: 553 case LL_NORMAL:
551 /* if we are loading an overlay, put the floors on the bottom */ 554 /* if we are loading an overlay, put the floors on the bottom */
552 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
… …
604{ 607{
605 int i, j = 0, unique = 0; 608 int i, j = 0, unique = 0;
606 object *op; 609 object *op;
607 610
608 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
609 for (i = 0; i < MAP_WIDTH (m); i++) 612 for (i = 0; i < m->width; i++)
610 for (j = 0; j < MAP_HEIGHT (m); j++) 613 for (j = 0; j < m->height; j++)
611 { 614 {
612 unique = 0; 615 unique = 0;
613 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 616 for (op = m->at (i, j).bot; op; op = op->above)
614 { 617 {
615 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 618 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
616 unique = 1; 619 unique = 1;
617 620
618 if (op->type == PLAYER) 621 if (op->type == PLAYER)
619 continue; 622 continue;
620 623
621 if (op->head || op->owner) 624 if (op->head || op->owner)
622 continue; 625 continue;
623 626
624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 627 if (unique || op->flag [FLAG_UNIQUE])
625 save_object (fp2, op, 3); 628 save_object (fp2, op, 3);
626 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 629 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
627 save_object (fp, op, 3); 630 save_object (fp, op, 3);
628 } 631 }
629 } 632 }
630} 633}
631 634
… …
633{ 636{
634 in_memory = MAP_SWAPPED; 637 in_memory = MAP_SWAPPED;
635 /* 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
636 * map archetype. Mimic that behaviour. 639 * map archetype. Mimic that behaviour.
637 */ 640 */
638 MAP_WIDTH (this) = 16; 641 this->width = 16;
639 MAP_HEIGHT (this) = 16; 642 this->height = 16;
640 MAP_RESET_TIMEOUT (this) = 0; 643 this->reset_timeout = 0;
641 MAP_TIMEOUT (this) = 300; 644 this->timeout = 300;
642 MAP_ENTER_X (this) = 0; 645 this->enter_x = 0;
643 MAP_ENTER_Y (this) = 0; 646 this->enter_y = 0;
644 /*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 */
645 MAP_WORLDPARTX (this) = -1; 648 this->worldpartx = -1;
646 MAP_WORLDPARTY (this) = -1; 649 this->worldparty = -1;
647} 650}
648 651
649/* 652/*
650 * Allocates, initialises, and returns a pointer to a maptile. 653 * Allocates, initialises, and returns a pointer to a maptile.
651 * 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
… …
1121 strcpy (m->path, filename); 1124 strcpy (m->path, filename);
1122 if (load_map_header (thawer, m)) 1125 if (load_map_header (thawer, m))
1123 { 1126 {
1124 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1125 delete_map (m); 1128 delete_map (m);
1126 return NULL; 1129 return 0;
1127 } 1130 }
1128 1131
1129 m->allocate (); 1132 m->allocate ();
1130 1133
1131 m->in_memory = MAP_LOADING; 1134 m->in_memory = MAP_LOADING;
1132 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1133 1136
1134 m->in_memory = MAP_IN_MEMORY; 1137 m->in_memory = MAP_IN_MEMORY;
1135 if (!MAP_DIFFICULTY (m)) 1138 if (!m->difficulty)
1136 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1139 m->difficulty = calculate_difficulty (m);
1137 set_map_reset_time (m); 1140 set_map_reset_time (m);
1138 m->instantiate (); 1141 m->instantiate ();
1139 return (m); 1142 return (m);
1140} 1143}
1141 1144
… …
1214 if (load_map_header (thawer, m)) 1217 if (load_map_header (thawer, m))
1215 { 1218 {
1216 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1217 delete_map (m); 1220 delete_map (m);
1218 m = load_original_map (m->path, 0); 1221 m = load_original_map (m->path, 0);
1219 return NULL; 1222 return 0;
1220 } 1223 }
1221 /*m->allocate ();*/ 1224 /*m->allocate ();*/
1222 1225
1223 m->in_memory = MAP_LOADING; 1226 m->in_memory = MAP_LOADING;
1224 load_objects (m, thawer, MAP_OVERLAY); 1227 load_objects (m, thawer, MAP_OVERLAY);
… …
1236delete_unique_items (maptile *m) 1239delete_unique_items (maptile *m)
1237{ 1240{
1238 int i, j, unique; 1241 int i, j, unique;
1239 object *op, *next; 1242 object *op, *next;
1240 1243
1241 for (i = 0; i < MAP_WIDTH (m); i++) 1244 for (i = 0; i < m->width; i++)
1242 for (j = 0; j < MAP_HEIGHT (m); j++) 1245 for (j = 0; j < m->height; j++)
1243 { 1246 {
1244 unique = 0; 1247 unique = 0;
1245 1248
1246 for (op = GET_MAP_OB (m, i, j); op; op = next) 1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1247 { 1250 {
… …
1250 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1251 unique = 1; 1254 unique = 1;
1252 1255
1253 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1254 { 1257 {
1255 clean_object (op); 1258 op->destroy_inv (false);
1256
1257 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1258 remove_button_link (op);
1259
1260 op->destroy (); 1259 op->destroy ();
1261 } 1260 }
1262 } 1261 }
1263 } 1262 }
1264} 1263}
… …
1290 return; 1289 return;
1291 1290
1292 m->in_memory = MAP_LOADING; 1291 m->in_memory = MAP_LOADING;
1293 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1294 delete_unique_items (m); /* original map before, don't duplicate them */ 1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1295 load_objects (m, thawer, 0); 1295 load_objects (m, thawer, 0);
1296 1296
1297 m->in_memory = MAP_IN_MEMORY; 1297 m->in_memory = MAP_IN_MEMORY;
1298} 1298}
1299
1300 1299
1301/* 1300/*
1302 * 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
1303 * file it was (originally) loaded from. Otherwise a temporary 1302 * file it was (originally) loaded from. Otherwise a temporary
1304 * filename will be genarated, and the file will be stored there. 1303 * filename will be genarated, and the file will be stored there.
1305 * The temporary filename will be stored in the maptileure. 1304 * The temporary filename will be stored in the maptileure.
1306 * 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
1307 * (this should have been updated when first loaded) 1306 * (this should have been updated when first loaded)
1308 */ 1307 */
1309
1310int 1308int
1311new_save_map (maptile *m, int flag) 1309new_save_map (maptile *m, int flag)
1312{ 1310{
1313 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1314 int i; 1312 int i;
… …
1446 freezer.save (filename); 1444 freezer.save (filename);
1447 1445
1448 return 0; 1446 return 0;
1449} 1447}
1450 1448
1451
1452/*
1453 * Remove and free all objects in the inventory of the given object.
1454 * object.c ?
1455 */
1456
1457void
1458clean_object (object *op)
1459{
1460 object *tmp, *next;
1461
1462 for (tmp = op->inv; tmp; tmp = next)
1463 {
1464 next = tmp->below;
1465
1466 clean_object (tmp);
1467 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1468 remove_button_link (tmp);
1469
1470 tmp->destroy ();
1471 }
1472}
1473
1474/* 1449/*
1475 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1476 */ 1451 */
1477
1478void 1452void
1479free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1480{ 1454{
1481 int i, j; 1455 if (!m->spaces)
1482 object *op; 1456 return;
1483 1457
1484 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1485 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1486 { 1460 {
1487 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1488 1462
1489 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bot)
1490 { 1464 {
1491 if (op == previous_obj)
1492 {
1493 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1494 break;
1495 }
1496
1497 previous_obj = op;
1498
1499 if (op->head != NULL) 1465 if (op->head)
1500 op = op->head; 1466 op = op->head;
1501 1467
1502 /* If the map isn't in memory, free_object will remove and 1468 op->destroy_inv (false);
1503 * free objects in op's inventory. So let it do the job.
1504 */
1505 if (m->in_memory == MAP_IN_MEMORY)
1506 clean_object (op);
1507
1508 op->destroy (); 1469 op->destroy ();
1509 } 1470 }
1510 } 1471 }
1511} 1472}
1512 1473
1513/* 1474/*
1514 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1515 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1516 */ 1477 */
1517
1518void 1478void
1519free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1520{ 1480{
1521 int i; 1481 if (!m->in_memory) //TODO: makes no sense to me?
1522
1523 if (!m->in_memory)
1524 {
1525 LOG (llevError, "Trying to free freed map.\n");
1526 return; 1482 return;
1527 } 1483
1484 m->in_memory = MAP_SAVING;
1528 1485
1529 // TODO: use new/delete 1486 // TODO: use new/delete
1530#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531 1487
1532 if (flag && m->spaces) 1488 if (flag && m->spaces)
1533 free_all_objects (m); 1489 free_all_objects (m);
1534 if (m->name)
1535 FREE_AND_CLEAR (m->name);
1536 if (m->spaces)
1537 FREE_AND_CLEAR (m->spaces);
1538 if (m->msg)
1539 FREE_AND_CLEAR (m->msg);
1540 if (m->maplore)
1541 FREE_AND_CLEAR (m->maplore);
1542 1490
1543 delete [] m->shopitems; 1491 free (m->name), m->name = 0;
1544 m->shopitems = 0; 1492 free (m->spaces), m->spaces = 0;
1545 1493 free (m->msg), m->msg = 0;
1546 if (m->shoprace) 1494 free (m->maplore), m->maplore = 0;
1547 FREE_AND_CLEAR (m->shoprace); 1495 free (m->shoprace), m->shoprace = 0;
1496 delete [] m->shopitems, m->shopitems = 0;
1548 1497
1549 if (m->buttons) 1498 if (m->buttons)
1550 free_objectlinkpt (m->buttons); 1499 free_objectlinkpt (m->buttons), m->buttons = 0;
1551 1500
1552 m->buttons = NULL;
1553
1554 for (i = 0; i < 4; i++) 1501 for (int i = 0; i < 4; i++)
1555 { 1502 {
1556 if (m->tile_path[i]) 1503 if (m->tile_path[i])
1557 FREE_AND_CLEAR (m->tile_path[i]); 1504 free (m->tile_path[i]), m->tile_path[i] = 0;
1505
1558 m->tile_map[i] = NULL; 1506 m->tile_map[i] = 0;
1559 } 1507 }
1560 1508
1561 m->in_memory = MAP_SWAPPED; 1509 m->in_memory = MAP_SWAPPED;
1562
1563#undef FREE_AND_CLEAR
1564
1565} 1510}
1566 1511
1567/* 1512maptile::~maptile ()
1568 * function: vanish maptile 1513{
1569 * m : pointer to maptile, if NULL no action 1514 free_map (this, 1);
1570 * this deletes all the data on the map (freeing pointers) 1515 free (tmpname);
1571 * and then removes this map from the global linked list of maps. 1516}
1517
1518void
1519maptile::do_destroy ()
1520{
1521 attachable::do_destroy ();
1522
1523 free_all_objects (this);
1524
1525 /* We need to look through all the maps and see if any maps
1526 * are pointing at this one for tiling information. Since
1527 * tiling can be asymetric, we just can not look to see which
1528 * maps this map tiles with and clears those.
1572 */ 1529 */
1530 //TODO: non-euclidean-tiling MUST GO
1531 for (maptile *m = first_map; m; m = m->next)
1532 for (int i = 0; i < 4; i++)
1533 if (m->tile_map[i] == this)
1534 m->tile_map[i] = 0;
1573 1535
1536 if (first_map == this)
1537 first_map = next;
1538 else
1539 for (maptile *m = first_map; m; m = m->next)
1540 if (m->next = this)
1541 {
1542 m->next = next;
1543 break;
1544 }
1545}
1546
1547//TODO: must go
1574void 1548void
1575delete_map (maptile *m) 1549delete_map (maptile *m)
1576{ 1550{
1577 maptile *tmp, *last;
1578 int i;
1579
1580 if (!m) 1551 if (m)
1581 return; 1552 m->destroy ();
1582
1583 m->clear ();
1584
1585 if (m->in_memory == MAP_IN_MEMORY)
1586 {
1587 /* change to MAP_SAVING, even though we are not,
1588 * so that remove_ob doesn't do as much work.
1589 */
1590 m->in_memory = MAP_SAVING;
1591 free_map (m, 1);
1592 }
1593 /* move this out of free_map, since tmpname can still be needed if
1594 * the map is swapped out.
1595 */
1596 if (m->tmpname)
1597 {
1598 free (m->tmpname);
1599 m->tmpname = NULL;
1600 }
1601 last = NULL;
1602 /* We need to look through all the maps and see if any maps
1603 * are pointing at this one for tiling information. Since
1604 * tiling can be assymetric, we just can not look to see which
1605 * maps this map tiles with and clears those.
1606 */
1607 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1608 {
1609 if (tmp->next == m)
1610 last = tmp;
1611
1612 /* This should hopefully get unrolled on a decent compiler */
1613 for (i = 0; i < 4; i++)
1614 if (tmp->tile_map[i] == m)
1615 tmp->tile_map[i] = NULL;
1616 }
1617
1618 /* If last is null, then this should be the first map in the list */
1619 if (!last)
1620 {
1621 if (m == first_map)
1622 first_map = m->next;
1623 else
1624 /* m->path is a static char, so should hopefully still have
1625 * some useful data in it.
1626 */
1627 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1628 }
1629 else
1630 last->next = m->next;
1631
1632 delete m;
1633} 1553}
1634 1554
1635/* 1555/*
1636 * Makes sure the given map is loaded and swapped in. 1556 * Makes sure the given map is loaded and swapped in.
1637 * name is path name of the map. 1557 * name is path name of the map.
… …
1644 * Returns a pointer to the given map. 1564 * Returns a pointer to the given map.
1645 */ 1565 */
1646maptile * 1566maptile *
1647ready_map_name (const char *name, int flags) 1567ready_map_name (const char *name, int flags)
1648{ 1568{
1649 maptile *m;
1650
1651 if (!name) 1569 if (!name)
1652 return (NULL); 1570 return 0;
1653 1571
1654 /* Have we been at this level before? */ 1572 /* Have we been at this level before? */
1655 m = has_been_loaded (name); 1573 maptile *m = has_been_loaded (name);
1656 1574
1657 /* Map is good to go, so just return it */ 1575 /* Map is good to go, so just return it */
1658 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1576 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1659 {
1660 return m; 1577 return m;
1661 }
1662 1578
1663 /* unique maps always get loaded from their original location, and never 1579 /* unique maps always get loaded from their original location, and never
1664 * a temp location. Likewise, if map_flush is set, or we have never loaded 1580 * a temp location. Likewise, if map_flush is set, or we have never loaded
1665 * this map, load it now. I removed the reset checking from here - 1581 * this map, load it now. I removed the reset checking from here -
1666 * it seems the probability of a player trying to enter a map that should 1582 * it seems the probability of a player trying to enter a map that should
… …
1668 * a bit cleaner (and players probably shouldn't rely on exact timing for 1584 * a bit cleaner (and players probably shouldn't rely on exact timing for
1669 * resets in any case - if they really care, they should use the 'maps command. 1585 * resets in any case - if they really care, they should use the 'maps command.
1670 */ 1586 */
1671 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1587 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1672 { 1588 {
1673
1674 /* first visit or time to reset */ 1589 /* first visit or time to reset */
1675 if (m) 1590 if (m)
1676 { 1591 {
1677 clean_tmp_map (m); /* Doesn't make much difference */ 1592 clean_tmp_map (m); /* Doesn't make much difference */
1678 delete_map (m); 1593 delete_map (m);
… …
1765 int x, y, i; 1680 int x, y, i;
1766 long monster_cnt = 0; 1681 long monster_cnt = 0;
1767 double avgexp = 0; 1682 double avgexp = 0;
1768 sint64 total_exp = 0; 1683 sint64 total_exp = 0;
1769 1684
1770 if (MAP_DIFFICULTY (m)) 1685 if (m->difficulty)
1771 { 1686 {
1772 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1687 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1773 return MAP_DIFFICULTY (m); 1688 return m->difficulty;
1774 } 1689 }
1775 1690
1776 for (x = 0; x < MAP_WIDTH (m); x++) 1691 for (x = 0; x < m->width; x++)
1777 for (y = 0; y < MAP_HEIGHT (m); y++) 1692 for (y = 0; y < m->height; y++)
1778 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)
1779 { 1694 {
1780 if (QUERY_FLAG (op, FLAG_MONSTER)) 1695 if (QUERY_FLAG (op, FLAG_MONSTER))
1781 { 1696 {
1782 total_exp += op->stats.exp; 1697 total_exp += op->stats.exp;
… …
1899 1814
1900 middle_obj = 0; 1815 middle_obj = 0;
1901 top_obj = 0; 1816 top_obj = 0;
1902 floor_obj = 0; 1817 floor_obj = 0;
1903 1818
1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) 1819 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1905 { 1820 {
1906 /* This could be made additive I guess (two lights better than 1821 /* This could be made additive I guess (two lights better than
1907 * 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
1908 * light bulbs do not illuminate twice as far as once since 1823 * light bulbs do not illuminate twice as far as once since
1909 * it is a dissapation factor that is cubed. 1824 * it is a dissapation factor that is cubed.
… …
2059void 1974void
2060set_map_reset_time (maptile *map) 1975set_map_reset_time (maptile *map)
2061{ 1976{
2062 int timeout; 1977 int timeout;
2063 1978
2064 timeout = MAP_RESET_TIMEOUT (map); 1979 timeout = map->reset_timeout;
2065 if (timeout <= 0) 1980 if (timeout <= 0)
2066 timeout = MAP_DEFAULTRESET; 1981 timeout = MAP_DEFAULTRESET;
2067 if (timeout >= MAP_MAXRESET) 1982 if (timeout >= MAP_MAXRESET)
2068 timeout = MAP_MAXRESET; 1983 timeout = MAP_MAXRESET;
2069 MAP_WHEN_RESET (map) = time (0) + timeout; 1984 map->reset_time = time (0) + timeout;
2070} 1985}
2071 1986
2072/* 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
2073 * 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
2074 * 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
… …
2117 return 1; 2032 return 1;
2118 2033
2119 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2034 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2120 load_and_link_tiled_map (m, 3); 2035 load_and_link_tiled_map (m, 3);
2121 2036
2122 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2037 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2123 } 2038 }
2124 2039
2125 if (x >= MAP_WIDTH (m)) 2040 if (x >= m->width)
2126 { 2041 {
2127 if (!m->tile_path[1]) 2042 if (!m->tile_path[1])
2128 return 1; 2043 return 1;
2129 2044
2130 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2045 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2131 load_and_link_tiled_map (m, 1); 2046 load_and_link_tiled_map (m, 1);
2132 2047
2133 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2048 return (out_of_map (m->tile_map[1], x - m->width, y));
2134 } 2049 }
2135 2050
2136 if (y < 0) 2051 if (y < 0)
2137 { 2052 {
2138 if (!m->tile_path[0]) 2053 if (!m->tile_path[0])
2139 return 1; 2054 return 1;
2140 2055
2141 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2056 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2142 load_and_link_tiled_map (m, 0); 2057 load_and_link_tiled_map (m, 0);
2143 2058
2144 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2059 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2145 } 2060 }
2146 2061
2147 if (y >= MAP_HEIGHT (m)) 2062 if (y >= m->height)
2148 { 2063 {
2149 if (!m->tile_path[2]) 2064 if (!m->tile_path[2])
2150 return 1; 2065 return 1;
2151 2066
2152 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2067 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2153 load_and_link_tiled_map (m, 2); 2068 load_and_link_tiled_map (m, 2);
2154 2069
2155 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2070 return (out_of_map (m->tile_map[2], x, y - m->height));
2156 } 2071 }
2157 2072
2158 /* Simple case - coordinates are within this local 2073 /* Simple case - coordinates are within this local
2159 * map. 2074 * map.
2160 */ 2075 */
… …
2178 if (!m->tile_path[3]) 2093 if (!m->tile_path[3])
2179 return 0; 2094 return 0;
2180 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2095 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2181 load_and_link_tiled_map (m, 3); 2096 load_and_link_tiled_map (m, 3);
2182 2097
2183 *x += MAP_WIDTH (m->tile_map[3]); 2098 *x += m->tile_map[3]->width;
2184 return (get_map_from_coord (m->tile_map[3], x, y)); 2099 return (get_map_from_coord (m->tile_map[3], x, y));
2185 } 2100 }
2186 2101
2187 if (*x >= MAP_WIDTH (m)) 2102 if (*x >= m->width)
2188 { 2103 {
2189 if (!m->tile_path[1]) 2104 if (!m->tile_path[1])
2190 return 0; 2105 return 0;
2191 2106
2192 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2107 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2193 load_and_link_tiled_map (m, 1); 2108 load_and_link_tiled_map (m, 1);
2194 2109
2195 *x -= MAP_WIDTH (m); 2110 *x -= m->width;
2196 return (get_map_from_coord (m->tile_map[1], x, y)); 2111 return (get_map_from_coord (m->tile_map[1], x, y));
2197 } 2112 }
2198 2113
2199 if (*y < 0) 2114 if (*y < 0)
2200 { 2115 {
… …
2202 return 0; 2117 return 0;
2203 2118
2204 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2205 load_and_link_tiled_map (m, 0); 2120 load_and_link_tiled_map (m, 0);
2206 2121
2207 *y += MAP_HEIGHT (m->tile_map[0]); 2122 *y += m->tile_map[0]->height;
2208 return (get_map_from_coord (m->tile_map[0], x, y)); 2123 return (get_map_from_coord (m->tile_map[0], x, y));
2209 } 2124 }
2210 2125
2211 if (*y >= MAP_HEIGHT (m)) 2126 if (*y >= m->height)
2212 { 2127 {
2213 if (!m->tile_path[2]) 2128 if (!m->tile_path[2])
2214 return 0; 2129 return 0;
2215 2130
2216 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2131 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2217 load_and_link_tiled_map (m, 2); 2132 load_and_link_tiled_map (m, 2);
2218 2133
2219 *y -= MAP_HEIGHT (m); 2134 *y -= m->height;
2220 return (get_map_from_coord (m->tile_map[2], x, y)); 2135 return (get_map_from_coord (m->tile_map[2], x, y));
2221 } 2136 }
2222 2137
2223 /* Simple case - coordinates are within this local 2138 /* Simple case - coordinates are within this local
2224 * map. 2139 * map.
… …
2244 2159
2245 } 2160 }
2246 else if (map1->tile_map[0] == map2) 2161 else if (map1->tile_map[0] == map2)
2247 { /* up */ 2162 { /* up */
2248 *dx = 0; 2163 *dx = 0;
2249 *dy = -MAP_HEIGHT (map2); 2164 *dy = -map2->height;
2250 } 2165 }
2251 else if (map1->tile_map[1] == map2) 2166 else if (map1->tile_map[1] == map2)
2252 { /* right */ 2167 { /* right */
2253 *dx = MAP_WIDTH (map1); 2168 *dx = map1->width;
2254 *dy = 0; 2169 *dy = 0;
2255 } 2170 }
2256 else if (map1->tile_map[2] == map2) 2171 else if (map1->tile_map[2] == map2)
2257 { /* down */ 2172 { /* down */
2258 *dx = 0; 2173 *dx = 0;
2259 *dy = MAP_HEIGHT (map1); 2174 *dy = map1->height;
2260 } 2175 }
2261 else if (map1->tile_map[3] == map2) 2176 else if (map1->tile_map[3] == map2)
2262 { /* left */ 2177 { /* left */
2263 *dx = -MAP_WIDTH (map2); 2178 *dx = -map2->width;
2264 *dy = 0; 2179 *dy = 0;
2265 2180
2266 } 2181 }
2267 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2182 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2268 { /* up right */ 2183 { /* up right */
2269 *dx = MAP_WIDTH (map1->tile_map[0]); 2184 *dx = map1->tile_map[0]->width;
2270 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2185 *dy = -map1->tile_map[0]->height;
2271 } 2186 }
2272 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2187 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2273 { /* up left */ 2188 { /* up left */
2274 *dx = -MAP_WIDTH (map2); 2189 *dx = -map2->width;
2275 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2190 *dy = -map1->tile_map[0]->height;
2276 } 2191 }
2277 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2192 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2278 { /* right up */ 2193 { /* right up */
2279 *dx = MAP_WIDTH (map1); 2194 *dx = map1->width;
2280 *dy = -MAP_HEIGHT (map2); 2195 *dy = -map2->height;
2281 } 2196 }
2282 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2197 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2283 { /* right down */ 2198 { /* right down */
2284 *dx = MAP_WIDTH (map1); 2199 *dx = map1->width;
2285 *dy = MAP_HEIGHT (map1->tile_map[1]); 2200 *dy = map1->tile_map[1]->height;
2286 } 2201 }
2287 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2202 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2288 { /* down right */ 2203 { /* down right */
2289 *dx = MAP_WIDTH (map1->tile_map[2]); 2204 *dx = map1->tile_map[2]->width;
2290 *dy = MAP_HEIGHT (map1); 2205 *dy = map1->height;
2291 } 2206 }
2292 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2207 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2293 { /* down left */ 2208 { /* down left */
2294 *dx = -MAP_WIDTH (map2); 2209 *dx = -map2->width;
2295 *dy = MAP_HEIGHT (map1); 2210 *dy = map1->height;
2296 } 2211 }
2297 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2212 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2298 { /* left up */ 2213 { /* left up */
2299 *dx = -MAP_WIDTH (map1->tile_map[3]); 2214 *dx = -map1->tile_map[3]->width;
2300 *dy = -MAP_HEIGHT (map2); 2215 *dy = -map2->height;
2301 } 2216 }
2302 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2217 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2303 { /* left down */ 2218 { /* left down */
2304 *dx = -MAP_WIDTH (map1->tile_map[3]); 2219 *dx = -map1->tile_map[3]->width;
2305 *dy = MAP_HEIGHT (map1->tile_map[3]); 2220 *dy = map1->tile_map[3]->height;
2306 2221
2307 } 2222 }
2308 else 2223 else
2309 { /* not "adjacent" enough */ 2224 { /* not "adjacent" enough */
2310 return 0; 2225 return 0;

Diff Legend

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