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.45 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.48 by root, Mon Dec 25 14:43:22 2006 UTC

… …
196 196
197void 197void
198dump_map (const maptile *m) 198dump_map (const maptile *m)
199{ 199{
200 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 200 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)); 201 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, MAP_ENTER_X (m), MAP_ENTER_Y (m));
202 202
203 if (m->msg != NULL) 203 if (m->msg != NULL)
204 LOG (llevError, "Message:\n%s", m->msg); 204 LOG (llevError, "Message:\n%s", m->msg);
205 205
206 if (m->maplore != NULL) 206 if (m->maplore != NULL)
… …
222void 222void
223dump_all_maps (void) 223dump_all_maps (void)
224{ 224{
225 maptile *m; 225 maptile *m;
226 226
227 for (m = first_map; m != NULL; m = m->next) 227 for (m = first_map; m; m = m->next)
228 {
229 dump_map (m); 228 dump_map (m);
230 }
231} 229}
232 230
233/* This rolls up wall, blocks_magic, blocks_view, etc, all into 231/* This rolls up wall, blocks_magic, blocks_view, etc, all into
234 * one function that just returns a P_.. value (see map.h) 232 * one function that just returns a P_.. value (see map.h)
235 * it will also do map translation for tiled maps, returning 233 * it will also do map translation for tiled maps, returning
… …
239 * is needed. The case of not passing values is if we're just 237 * is needed. The case of not passing values is if we're just
240 * checking for the existence of something on those spaces, but 238 * checking for the existence of something on those spaces, but
241 * don't expect to insert/remove anything from those spaces. 239 * don't expect to insert/remove anything from those spaces.
242 */ 240 */
243int 241int
244get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 242get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
245{ 243{
246 sint16 newx, newy; 244 sint16 newx, newy;
247 int retval = 0; 245 int retval = 0;
248 maptile *mp; 246 maptile *mp;
249 247
250 if (out_of_map (oldmap, x, y))
251 return P_OUT_OF_MAP;
252 newx = x; 248 newx = x;
253 newy = y; 249 newy = y;
250
254 mp = get_map_from_coord (oldmap, &newx, &newy); 251 mp = get_map_from_coord (oldmap, &newx, &newy);
252
253 if (!mp)
254 return P_OUT_OF_MAP;
255
255 if (mp != oldmap) 256 if (mp != oldmap)
256 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
257 if (newmap)
258 *newmap = mp;
259 if (nx)
260 *nx = newx;
261 if (ny)
262 *ny = newy;
263 258
264 retval |= mp->spaces[newx + mp->width * newy].flags; 259 if (newmap) *newmap = mp;
260 if (nx) *nx = newx;
261 if (ny) *ny = newy;
265 262
266 return retval; 263 return retval | mp->at (newx, newy).flags ();
267} 264}
268 265
269/* 266/*
270 * Returns true if the given coordinate is blocked except by the 267 * Returns true if the given coordinate is blocked except by the
271 * object passed is not blocking. This is used with 268 * object passed is not blocking. This is used with
… …
294 } 291 }
295 292
296 /* Save some cycles - instead of calling get_map_flags(), just get the value 293 /* Save some cycles - instead of calling get_map_flags(), just get the value
297 * directly. 294 * directly.
298 */ 295 */
299 mflags = m->spaces[sx + m->width * sy].flags; 296 mflags = m->at (sx, sy).flags ();
300 297
301 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 298 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
302 299
303 /* If space is currently not blocked by anything, no need to 300 /* If space is currently not blocked by anything, no need to
304 * go further. Not true for players - all sorts of special 301 * go further. Not true for players - all sorts of special
… …
412 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 409 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
413 if (flag & P_OUT_OF_MAP) 410 if (flag & P_OUT_OF_MAP)
414 return P_OUT_OF_MAP; 411 return P_OUT_OF_MAP;
415 412
416 /* don't have object, so don't know what types would block */ 413 /* don't have object, so don't know what types would block */
417 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 414 return m1->at (sx, sy).move_block;
418 } 415 }
419 416
420 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 417 for (tmp = ob->arch; tmp; tmp = tmp->more)
421 { 418 {
422 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 419 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
423 420
424 if (flag & P_OUT_OF_MAP) 421 if (flag & P_OUT_OF_MAP)
425 return P_OUT_OF_MAP; 422 return P_OUT_OF_MAP;
426 if (flag & P_IS_ALIVE) 423 if (flag & P_IS_ALIVE)
427 return P_IS_ALIVE; 424 return P_IS_ALIVE;
428 425
426 mapspace &ms = m1->at (sx, sy);
427
428
429 /* find_first_free_spot() calls this function. However, often 429 /* find_first_free_spot() calls this function. However, often
430 * ob doesn't have any move type (when used to place exits) 430 * ob doesn't have any move type (when used to place exits)
431 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 431 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
432 */ 432 */
433 433
434 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 434 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
435 continue; 435 continue;
436 436
437 /* Note it is intentional that we check ob - the movement type of the 437 /* Note it is intentional that we check ob - the movement type of the
438 * head of the object should correspond for the entire object. 438 * head of the object should correspond for the entire object.
439 */ 439 */
440 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 440 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
441 return P_NO_PASS; 441 return P_NO_PASS;
442 } 442 }
443 443
444 return 0; 444 return 0;
445} 445}
… …
483{ 483{
484 int x, y; 484 int x, y;
485 object *tmp, *op, *last, *above; 485 object *tmp, *op, *last, *above;
486 archetype *at; 486 archetype *at;
487 487
488 for (x = 0; x < MAP_WIDTH (m); x++) 488 for (x = 0; x < m->width; x++)
489 for (y = 0; y < MAP_HEIGHT (m); y++) 489 for (y = 0; y < m->height; y++)
490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) 490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
491 { 491 {
492 above = tmp->above; 492 above = tmp->above;
493 493
494 /* already multipart - don't do anything more */ 494 /* already multipart - don't do anything more */
… …
545 { 545 {
546 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 546 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
547 continue; 547 continue;
548 } 548 }
549 549
550
551 switch (i) 550 switch (i)
552 { 551 {
553 case LL_NORMAL: 552 case LL_NORMAL:
554 /* if we are loading an overlay, put the floors on the bottom */ 553 /* if we are loading an overlay, put the floors on the bottom */
555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 554 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
… …
607{ 606{
608 int i, j = 0, unique = 0; 607 int i, j = 0, unique = 0;
609 object *op; 608 object *op;
610 609
611 /* first pass - save one-part objects */ 610 /* first pass - save one-part objects */
612 for (i = 0; i < MAP_WIDTH (m); i++) 611 for (i = 0; i < m->width; i++)
613 for (j = 0; j < MAP_HEIGHT (m); j++) 612 for (j = 0; j < m->height; j++)
614 { 613 {
615 unique = 0; 614 unique = 0;
616 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 615 for (op = m->at (i, j).bottom; op; op = op->above)
617 { 616 {
618 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 617 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
619 unique = 1; 618 unique = 1;
620 619
621 if (op->type == PLAYER) 620 if (op->type == PLAYER)
622 continue; 621 continue;
623 622
624 if (op->head || op->owner) 623 if (op->head || op->owner)
625 continue; 624 continue;
626 625
627 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 626 if (unique || op->flag [FLAG_UNIQUE])
628 save_object (fp2, op, 3); 627 save_object (fp2, op, 3);
629 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 628 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
630 save_object (fp, op, 3); 629 save_object (fp, op, 3);
631 } 630 }
632 } 631 }
633} 632}
634 633
… …
636{ 635{
637 in_memory = MAP_SWAPPED; 636 in_memory = MAP_SWAPPED;
638 /* The maps used to pick up default x and y values from the 637 /* The maps used to pick up default x and y values from the
639 * map archetype. Mimic that behaviour. 638 * map archetype. Mimic that behaviour.
640 */ 639 */
641 MAP_WIDTH (this) = 16; 640 this->width = 16;
642 MAP_HEIGHT (this) = 16; 641 this->height = 16;
643 MAP_RESET_TIMEOUT (this) = 0; 642 MAP_RESET_TIMEOUT (this) = 0;
644 MAP_TIMEOUT (this) = 300; 643 MAP_TIMEOUT (this) = 300;
645 MAP_ENTER_X (this) = 0; 644 MAP_ENTER_X (this) = 0;
646 MAP_ENTER_Y (this) = 0; 645 MAP_ENTER_Y (this) = 0;
647 /*set part to -1 indicating conversion to weather map not yet done */ 646 /*set part to -1 indicating conversion to weather map not yet done */
… …
1124 strcpy (m->path, filename); 1123 strcpy (m->path, filename);
1125 if (load_map_header (thawer, m)) 1124 if (load_map_header (thawer, m))
1126 { 1125 {
1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1126 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1128 delete_map (m); 1127 delete_map (m);
1129 return NULL; 1128 return 0;
1130 } 1129 }
1131 1130
1132 m->allocate (); 1131 m->allocate ();
1133 1132
1134 m->in_memory = MAP_LOADING; 1133 m->in_memory = MAP_LOADING;
… …
1217 if (load_map_header (thawer, m)) 1216 if (load_map_header (thawer, m))
1218 { 1217 {
1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1218 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1220 delete_map (m); 1219 delete_map (m);
1221 m = load_original_map (m->path, 0); 1220 m = load_original_map (m->path, 0);
1222 return NULL; 1221 return 0;
1223 } 1222 }
1224 /*m->allocate ();*/ 1223 /*m->allocate ();*/
1225 1224
1226 m->in_memory = MAP_LOADING; 1225 m->in_memory = MAP_LOADING;
1227 load_objects (m, thawer, MAP_OVERLAY); 1226 load_objects (m, thawer, MAP_OVERLAY);
… …
1239delete_unique_items (maptile *m) 1238delete_unique_items (maptile *m)
1240{ 1239{
1241 int i, j, unique; 1240 int i, j, unique;
1242 object *op, *next; 1241 object *op, *next;
1243 1242
1244 for (i = 0; i < MAP_WIDTH (m); i++) 1243 for (i = 0; i < m->width; i++)
1245 for (j = 0; j < MAP_HEIGHT (m); j++) 1244 for (j = 0; j < m->height; j++)
1246 { 1245 {
1247 unique = 0; 1246 unique = 0;
1248 1247
1249 for (op = GET_MAP_OB (m, i, j); op; op = next) 1248 for (op = GET_MAP_OB (m, i, j); op; op = next)
1250 { 1249 {
… …
1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1252 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1254 unique = 1; 1253 unique = 1;
1255 1254
1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1255 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1257 { 1256 {
1258 clean_object (op); 1257 op->destroy_inv (false);
1259
1260 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1261 remove_button_link (op);
1262
1263 op->destroy (); 1258 op->destroy ();
1264 } 1259 }
1265 } 1260 }
1266 } 1261 }
1267} 1262}
… …
1449 freezer.save (filename); 1444 freezer.save (filename);
1450 1445
1451 return 0; 1446 return 0;
1452} 1447}
1453 1448
1454
1455/*
1456 * Remove and free all objects in the inventory of the given object.
1457 * object.c ?
1458 */
1459
1460void
1461clean_object (object *op)
1462{
1463 object *tmp, *next;
1464
1465 for (tmp = op->inv; tmp; tmp = next)
1466 {
1467 next = tmp->below;
1468
1469 clean_object (tmp);
1470 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1471 remove_button_link (tmp);
1472
1473 tmp->destroy ();
1474 }
1475}
1476
1477/* 1449/*
1478 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1479 */ 1451 */
1480
1481void 1452void
1482free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1483{ 1454{
1484 int i, j; 1455 if (!m->spaces)
1485 object *op; 1456 return;
1486 1457
1487 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1488 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1489 { 1460 {
1490 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1491 1462
1492 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bottom)
1493 { 1464 {
1494 if (op == previous_obj)
1495 {
1496 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1497 break;
1498 }
1499
1500 previous_obj = op;
1501
1502 if (op->head != NULL) 1465 if (op->head)
1503 op = op->head; 1466 op = op->head;
1504 1467
1505 /* If the map isn't in memory, free_object will remove and 1468 op->destroy_inv (false);
1506 * free objects in op's inventory. So let it do the job.
1507 */
1508 if (m->in_memory == MAP_IN_MEMORY)
1509 clean_object (op);
1510
1511 op->destroy (); 1469 op->destroy ();
1512 } 1470 }
1513 } 1471 }
1514} 1472}
1515 1473
1516/* 1474/*
1517 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1518 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1519 */ 1477 */
1520
1521void 1478void
1522free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1523{ 1480{
1524 int i; 1481 if (m->in_memory != MAP_IN_MEMORY)
1525
1526 if (!m->in_memory)
1527 {
1528 LOG (llevError, "Trying to free freed map.\n");
1529 return; 1482 return;
1530 } 1483
1484 m->in_memory = MAP_SAVING;
1531 1485
1532 // TODO: use new/delete 1486 // TODO: use new/delete
1533#define FREE_AND_CLEAR(p) { free (p); p = NULL; } 1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1534 1488
1535 if (flag && m->spaces) 1489 if (flag && m->spaces)
… …
1552 if (m->buttons) 1506 if (m->buttons)
1553 free_objectlinkpt (m->buttons); 1507 free_objectlinkpt (m->buttons);
1554 1508
1555 m->buttons = NULL; 1509 m->buttons = NULL;
1556 1510
1557 for (i = 0; i < 4; i++) 1511 for (int i = 0; i < 4; i++)
1558 { 1512 {
1559 if (m->tile_path[i]) 1513 if (m->tile_path[i])
1560 FREE_AND_CLEAR (m->tile_path[i]); 1514 FREE_AND_CLEAR (m->tile_path[i]);
1515
1561 m->tile_map[i] = NULL; 1516 m->tile_map[i] = 0;
1562 } 1517 }
1563 1518
1564 m->in_memory = MAP_SWAPPED; 1519 m->in_memory = MAP_SWAPPED;
1565 1520
1566#undef FREE_AND_CLEAR 1521#undef FREE_AND_CLEAR
1567
1568} 1522}
1569 1523
1570/* 1524maptile::~maptile ()
1571 * function: vanish maptile 1525{
1572 * m : pointer to maptile, if NULL no action 1526 free_map (this, 1);
1573 * this deletes all the data on the map (freeing pointers) 1527 free (tmpname);
1574 * and then removes this map from the global linked list of maps. 1528}
1529
1530void
1531maptile::do_destroy ()
1532{
1533 attachable::do_destroy ();
1534
1535 free_all_objects (this);
1536
1537 /* We need to look through all the maps and see if any maps
1538 * are pointing at this one for tiling information. Since
1539 * tiling can be asymetric, we just can not look to see which
1540 * maps this map tiles with and clears those.
1575 */ 1541 */
1542 //TODO: non-euclidean-tiling MUST GO
1543 for (maptile *m = first_map; m; m = m->next)
1544 for (int i = 0; i < 4; i++)
1545 if (m->tile_map[i] == this)
1546 m->tile_map[i] = 0;
1576 1547
1548 if (first_map == this)
1549 first_map = next;
1550 else
1551 for (maptile *m = first_map; m; m = m->next)
1552 if (m->next = this)
1553 {
1554 m->next = next;
1555 break;
1556 }
1557}
1558
1559//TODO: must go
1577void 1560void
1578delete_map (maptile *m) 1561delete_map (maptile *m)
1579{ 1562{
1580 maptile *tmp, *last;
1581 int i;
1582
1583 if (!m) 1563 if (m)
1584 return; 1564 m->destroy ();
1585
1586 m->clear ();
1587
1588 if (m->in_memory == MAP_IN_MEMORY)
1589 {
1590 /* change to MAP_SAVING, even though we are not,
1591 * so that remove_ob doesn't do as much work.
1592 */
1593 m->in_memory = MAP_SAVING;
1594 free_map (m, 1);
1595 }
1596 /* move this out of free_map, since tmpname can still be needed if
1597 * the map is swapped out.
1598 */
1599 if (m->tmpname)
1600 {
1601 free (m->tmpname);
1602 m->tmpname = NULL;
1603 }
1604 last = NULL;
1605 /* We need to look through all the maps and see if any maps
1606 * are pointing at this one for tiling information. Since
1607 * tiling can be assymetric, we just can not look to see which
1608 * maps this map tiles with and clears those.
1609 */
1610 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1611 {
1612 if (tmp->next == m)
1613 last = tmp;
1614
1615 /* This should hopefully get unrolled on a decent compiler */
1616 for (i = 0; i < 4; i++)
1617 if (tmp->tile_map[i] == m)
1618 tmp->tile_map[i] = NULL;
1619 }
1620
1621 /* If last is null, then this should be the first map in the list */
1622 if (!last)
1623 {
1624 if (m == first_map)
1625 first_map = m->next;
1626 else
1627 /* m->path is a static char, so should hopefully still have
1628 * some useful data in it.
1629 */
1630 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1631 }
1632 else
1633 last->next = m->next;
1634
1635 delete m;
1636} 1565}
1637 1566
1638/* 1567/*
1639 * Makes sure the given map is loaded and swapped in. 1568 * Makes sure the given map is loaded and swapped in.
1640 * name is path name of the map. 1569 * name is path name of the map.
… …
1647 * Returns a pointer to the given map. 1576 * Returns a pointer to the given map.
1648 */ 1577 */
1649maptile * 1578maptile *
1650ready_map_name (const char *name, int flags) 1579ready_map_name (const char *name, int flags)
1651{ 1580{
1652 maptile *m;
1653
1654 if (!name) 1581 if (!name)
1655 return (NULL); 1582 return 0;
1656 1583
1657 /* Have we been at this level before? */ 1584 /* Have we been at this level before? */
1658 m = has_been_loaded (name); 1585 maptile *m = has_been_loaded (name);
1659 1586
1660 /* Map is good to go, so just return it */ 1587 /* Map is good to go, so just return it */
1661 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1588 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1662 {
1663 return m; 1589 return m;
1664 }
1665 1590
1666 /* unique maps always get loaded from their original location, and never 1591 /* unique maps always get loaded from their original location, and never
1667 * a temp location. Likewise, if map_flush is set, or we have never loaded 1592 * a temp location. Likewise, if map_flush is set, or we have never loaded
1668 * this map, load it now. I removed the reset checking from here - 1593 * this map, load it now. I removed the reset checking from here -
1669 * it seems the probability of a player trying to enter a map that should 1594 * it seems the probability of a player trying to enter a map that should
… …
1671 * a bit cleaner (and players probably shouldn't rely on exact timing for 1596 * a bit cleaner (and players probably shouldn't rely on exact timing for
1672 * resets in any case - if they really care, they should use the 'maps command. 1597 * resets in any case - if they really care, they should use the 'maps command.
1673 */ 1598 */
1674 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1599 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1675 { 1600 {
1676
1677 /* first visit or time to reset */ 1601 /* first visit or time to reset */
1678 if (m) 1602 if (m)
1679 { 1603 {
1680 clean_tmp_map (m); /* Doesn't make much difference */ 1604 clean_tmp_map (m); /* Doesn't make much difference */
1681 delete_map (m); 1605 delete_map (m);
… …
1774 { 1698 {
1775 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1699 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1776 return MAP_DIFFICULTY (m); 1700 return MAP_DIFFICULTY (m);
1777 } 1701 }
1778 1702
1779 for (x = 0; x < MAP_WIDTH (m); x++) 1703 for (x = 0; x < m->width; x++)
1780 for (y = 0; y < MAP_HEIGHT (m); y++) 1704 for (y = 0; y < m->height; y++)
1781 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 1705 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1782 { 1706 {
1783 if (QUERY_FLAG (op, FLAG_MONSTER)) 1707 if (QUERY_FLAG (op, FLAG_MONSTER))
1784 { 1708 {
1785 total_exp += op->stats.exp; 1709 total_exp += op->stats.exp;
… …
1886 * on the map (what it looks like, whether it blocks magic, 1810 * on the map (what it looks like, whether it blocks magic,
1887 * has a living creatures, prevents people from passing 1811 * has a living creatures, prevents people from passing
1888 * through, etc) 1812 * through, etc)
1889 */ 1813 */
1890void 1814void
1891update_position (maptile *m, int x, int y) 1815mapspace::update_ ()
1892{ 1816{
1893 object *tmp, *last = 0; 1817 object *tmp, *last = 0;
1894 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1818 uint8 flags = 0, light = 0, anywhere = 0;
1895 New_Face *top, *floor, *middle; 1819 New_Face *top, *floor, *middle;
1896 object *top_obj, *floor_obj, *middle_obj; 1820 object *top_obj, *floor_obj, *middle_obj;
1897 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1821 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1898 1822
1899 oldflags = GET_MAP_FLAGS (m, x, y);
1900 if (!(oldflags & P_NEED_UPDATE))
1901 {
1902 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1903 return;
1904 }
1905
1906 middle = blank_face; 1823 middle = blank_face;
1907 top = blank_face; 1824 top = blank_face;
1908 floor = blank_face; 1825 floor = blank_face;
1909 1826
1910 middle_obj = 0; 1827 middle_obj = 0;
1911 top_obj = 0; 1828 top_obj = 0;
1912 floor_obj = 0; 1829 floor_obj = 0;
1913 1830
1914 for (tmp = GET_MAP_OB (m, x, y); tmp; last = tmp, tmp = tmp->above) 1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1915 { 1832 {
1916 /* This could be made additive I guess (two lights better than 1833 /* This could be made additive I guess (two lights better than
1917 * one). But if so, it shouldn't be a simple additive - 2 1834 * one). But if so, it shouldn't be a simple additive - 2
1918 * light bulbs do not illuminate twice as far as once since 1835 * light bulbs do not illuminate twice as far as once since
1919 * it is a dissapation factor that is cubed. 1836 * it is a dissapation factor that is cubed.
… …
1983 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1900 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1984 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; 1901 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1985 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; 1902 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1986 } 1903 }
1987 1904
1988 /* we don't want to rely on this function to have accurate flags, but 1905 this->light = light;
1989 * since we're already doing the work, we calculate them here.
1990 * if they don't match, logic is broken someplace.
1991 */
1992 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
1993 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
1994 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
1995
1996 mapspace &s = m->at (x, y);
1997
1998 s.flags = flags; 1906 this->flags_ = flags;
1999 s.move_block = move_block & ~move_allow; 1907 this->move_block = move_block & ~move_allow;
2000 s.move_on = move_on; 1908 this->move_on = move_on;
2001 s.move_off = move_off; 1909 this->move_off = move_off;
2002 s.move_slow = move_slow; 1910 this->move_slow = move_slow;
2003 1911
2004 /* At this point, we have a floor face (if there is a floor), 1912 /* At this point, we have a floor face (if there is a floor),
2005 * and the floor is set - we are not going to touch it at 1913 * and the floor is set - we are not going to touch it at
2006 * this point. 1914 * this point.
2007 * middle contains the highest visibility face. 1915 * middle contains the highest visibility face.
… …
2068 middle = blank_face; 1976 middle = blank_face;
2069 1977
2070 if (top == middle) 1978 if (top == middle)
2071 middle = blank_face; 1979 middle = blank_face;
2072 1980
2073 SET_MAP_FACE (m, x, y, top, 0); 1981 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2074 if (top != blank_face) 1982 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2075 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); 1983 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2076 else
2077 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2078
2079 SET_MAP_FACE (m, x, y, middle, 1);
2080 if (middle != blank_face)
2081 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2082 else
2083 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2084
2085 SET_MAP_FACE (m, x, y, floor, 2);
2086 if (floor != blank_face)
2087 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2088 else
2089 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2090
2091 SET_MAP_LIGHT (m, x, y, light);
2092} 1984}
2093
2094 1985
2095void 1986void
2096set_map_reset_time (maptile *map) 1987set_map_reset_time (maptile *map)
2097{ 1988{
2098 int timeout; 1989 int timeout;
… …
2138 * 2029 *
2139 */ 2030 */
2140int 2031int
2141out_of_map (maptile *m, int x, int y) 2032out_of_map (maptile *m, int x, int y)
2142{ 2033{
2143
2144 /* If we get passed a null map, this is obviously the 2034 /* If we get passed a null map, this is obviously the
2145 * case. This generally shouldn't happen, but if the 2035 * case. This generally shouldn't happen, but if the
2146 * map loads fail below, it could happen. 2036 * map loads fail below, it could happen.
2147 */ 2037 */
2148 if (!m) 2038 if (!m)
… …
2150 2040
2151 if (x < 0) 2041 if (x < 0)
2152 { 2042 {
2153 if (!m->tile_path[3]) 2043 if (!m->tile_path[3])
2154 return 1; 2044 return 1;
2045
2155 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2046 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2156 {
2157 load_and_link_tiled_map (m, 3); 2047 load_and_link_tiled_map (m, 3);
2158 } 2048
2159 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2049 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2160 } 2050 }
2161 if (x >= MAP_WIDTH (m)) 2051
2052 if (x >= m->width)
2162 { 2053 {
2163 if (!m->tile_path[1]) 2054 if (!m->tile_path[1])
2164 return 1; 2055 return 1;
2056
2165 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2057 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2166 {
2167 load_and_link_tiled_map (m, 1); 2058 load_and_link_tiled_map (m, 1);
2168 } 2059
2169 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2060 return (out_of_map (m->tile_map[1], x - m->width, y));
2170 } 2061 }
2062
2171 if (y < 0) 2063 if (y < 0)
2172 { 2064 {
2173 if (!m->tile_path[0]) 2065 if (!m->tile_path[0])
2174 return 1; 2066 return 1;
2067
2175 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2068 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2176 {
2177 load_and_link_tiled_map (m, 0); 2069 load_and_link_tiled_map (m, 0);
2178 } 2070
2179 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2071 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2180 } 2072 }
2181 if (y >= MAP_HEIGHT (m)) 2073
2074 if (y >= m->height)
2182 { 2075 {
2183 if (!m->tile_path[2]) 2076 if (!m->tile_path[2])
2184 return 1; 2077 return 1;
2078
2185 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2079 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2186 {
2187 load_and_link_tiled_map (m, 2); 2080 load_and_link_tiled_map (m, 2);
2188 } 2081
2189 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2082 return (out_of_map (m->tile_map[2], x, y - m->height));
2190 } 2083 }
2191 2084
2192 /* Simple case - coordinates are within this local 2085 /* Simple case - coordinates are within this local
2193 * map. 2086 * map.
2194 */ 2087 */
… …
2208{ 2101{
2209 2102
2210 if (*x < 0) 2103 if (*x < 0)
2211 { 2104 {
2212 if (!m->tile_path[3]) 2105 if (!m->tile_path[3])
2213 return NULL; 2106 return 0;
2214 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2107 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2215 load_and_link_tiled_map (m, 3); 2108 load_and_link_tiled_map (m, 3);
2216 2109
2217 *x += MAP_WIDTH (m->tile_map[3]); 2110 *x += m->tile_map[3]->width;
2218 return (get_map_from_coord (m->tile_map[3], x, y)); 2111 return (get_map_from_coord (m->tile_map[3], x, y));
2219 } 2112 }
2220 if (*x >= MAP_WIDTH (m)) 2113
2114 if (*x >= m->width)
2221 { 2115 {
2222 if (!m->tile_path[1]) 2116 if (!m->tile_path[1])
2223 return NULL; 2117 return 0;
2118
2224 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2225 load_and_link_tiled_map (m, 1); 2120 load_and_link_tiled_map (m, 1);
2226 2121
2227 *x -= MAP_WIDTH (m); 2122 *x -= m->width;
2228 return (get_map_from_coord (m->tile_map[1], x, y)); 2123 return (get_map_from_coord (m->tile_map[1], x, y));
2229 } 2124 }
2125
2230 if (*y < 0) 2126 if (*y < 0)
2231 { 2127 {
2232 if (!m->tile_path[0]) 2128 if (!m->tile_path[0])
2233 return NULL; 2129 return 0;
2130
2234 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2131 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2235 load_and_link_tiled_map (m, 0); 2132 load_and_link_tiled_map (m, 0);
2236 2133
2237 *y += MAP_HEIGHT (m->tile_map[0]); 2134 *y += m->tile_map[0]->height;
2238 return (get_map_from_coord (m->tile_map[0], x, y)); 2135 return (get_map_from_coord (m->tile_map[0], x, y));
2239 } 2136 }
2240 if (*y >= MAP_HEIGHT (m)) 2137
2138 if (*y >= m->height)
2241 { 2139 {
2242 if (!m->tile_path[2]) 2140 if (!m->tile_path[2])
2243 return NULL; 2141 return 0;
2142
2244 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2143 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2245 load_and_link_tiled_map (m, 2); 2144 load_and_link_tiled_map (m, 2);
2246 2145
2247 *y -= MAP_HEIGHT (m); 2146 *y -= m->height;
2248 return (get_map_from_coord (m->tile_map[2], x, y)); 2147 return (get_map_from_coord (m->tile_map[2], x, y));
2249 } 2148 }
2250 2149
2251 /* Simple case - coordinates are within this local 2150 /* Simple case - coordinates are within this local
2252 * map. 2151 * map.
… …
2272 2171
2273 } 2172 }
2274 else if (map1->tile_map[0] == map2) 2173 else if (map1->tile_map[0] == map2)
2275 { /* up */ 2174 { /* up */
2276 *dx = 0; 2175 *dx = 0;
2277 *dy = -MAP_HEIGHT (map2); 2176 *dy = -map2->height;
2278 } 2177 }
2279 else if (map1->tile_map[1] == map2) 2178 else if (map1->tile_map[1] == map2)
2280 { /* right */ 2179 { /* right */
2281 *dx = MAP_WIDTH (map1); 2180 *dx = map1->width;
2282 *dy = 0; 2181 *dy = 0;
2283 } 2182 }
2284 else if (map1->tile_map[2] == map2) 2183 else if (map1->tile_map[2] == map2)
2285 { /* down */ 2184 { /* down */
2286 *dx = 0; 2185 *dx = 0;
2287 *dy = MAP_HEIGHT (map1); 2186 *dy = map1->height;
2288 } 2187 }
2289 else if (map1->tile_map[3] == map2) 2188 else if (map1->tile_map[3] == map2)
2290 { /* left */ 2189 { /* left */
2291 *dx = -MAP_WIDTH (map2); 2190 *dx = -map2->width;
2292 *dy = 0; 2191 *dy = 0;
2293 2192
2294 } 2193 }
2295 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2194 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2296 { /* up right */ 2195 { /* up right */
2297 *dx = MAP_WIDTH (map1->tile_map[0]); 2196 *dx = map1->tile_map[0]->width;
2298 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2197 *dy = -map1->tile_map[0]->height;
2299 } 2198 }
2300 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2199 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2301 { /* up left */ 2200 { /* up left */
2302 *dx = -MAP_WIDTH (map2); 2201 *dx = -map2->width;
2303 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2202 *dy = -map1->tile_map[0]->height;
2304 } 2203 }
2305 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2204 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2306 { /* right up */ 2205 { /* right up */
2307 *dx = MAP_WIDTH (map1); 2206 *dx = map1->width;
2308 *dy = -MAP_HEIGHT (map2); 2207 *dy = -map2->height;
2309 } 2208 }
2310 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2209 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2311 { /* right down */ 2210 { /* right down */
2312 *dx = MAP_WIDTH (map1); 2211 *dx = map1->width;
2313 *dy = MAP_HEIGHT (map1->tile_map[1]); 2212 *dy = map1->tile_map[1]->height;
2314 } 2213 }
2315 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2214 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2316 { /* down right */ 2215 { /* down right */
2317 *dx = MAP_WIDTH (map1->tile_map[2]); 2216 *dx = map1->tile_map[2]->width;
2318 *dy = MAP_HEIGHT (map1); 2217 *dy = map1->height;
2319 } 2218 }
2320 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2219 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2321 { /* down left */ 2220 { /* down left */
2322 *dx = -MAP_WIDTH (map2); 2221 *dx = -map2->width;
2323 *dy = MAP_HEIGHT (map1); 2222 *dy = map1->height;
2324 } 2223 }
2325 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2224 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2326 { /* left up */ 2225 { /* left up */
2327 *dx = -MAP_WIDTH (map1->tile_map[3]); 2226 *dx = -map1->tile_map[3]->width;
2328 *dy = -MAP_HEIGHT (map2); 2227 *dy = -map2->height;
2329 } 2228 }
2330 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2229 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2331 { /* left down */ 2230 { /* left down */
2332 *dx = -MAP_WIDTH (map1->tile_map[3]); 2231 *dx = -map1->tile_map[3]->width;
2333 *dy = MAP_HEIGHT (map1->tile_map[3]); 2232 *dy = map1->tile_map[3]->height;
2334 2233
2335 } 2234 }
2336 else 2235 else
2337 { /* not "adjacent" enough */ 2236 { /* not "adjacent" enough */
2338 return 0; 2237 return 0;

Diff Legend

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