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

Diff Legend

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