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.53 by root, Wed Dec 27 09:28:01 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;
42
43 if (!name || !*name) 40 if (!name || !*name)
44 return 0; 41 return 0;
45 for (map = first_map; map; map = map->next) 42
43 for_all_maps (map)
46 if (!strcmp (name, map->path)) 44 if (!strcmp (name, map->path))
47 break;
48 return (map); 45 return map;
46
47 return 0;
49} 48}
50 49
51/* 50/*
52 * This makes a path absolute outside the world of Crossfire. 51 * This makes a path absolute outside the world of Crossfire.
53 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 52 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
… …
196 195
197void 196void
198dump_map (const maptile *m) 197dump_map (const maptile *m)
199{ 198{
200 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 199 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)); 200 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
202 201
203 if (m->msg != NULL) 202 if (m->msg != NULL)
204 LOG (llevError, "Message:\n%s", m->msg); 203 LOG (llevError, "Message:\n%s", m->msg);
205 204
206 if (m->maplore != NULL) 205 if (m->maplore != NULL)
… …
220 */ 219 */
221 220
222void 221void
223dump_all_maps (void) 222dump_all_maps (void)
224{ 223{
225 maptile *m; 224 for_all_maps (m)
226
227 for (m = first_map; m; m = m->next)
228 dump_map (m); 225 dump_map (m);
229} 226}
230 227
231/* This rolls up wall, blocks_magic, blocks_view, etc, all into 228/* This rolls up wall, blocks_magic, blocks_view, etc, all into
232 * one function that just returns a P_.. value (see map.h) 229 * one function that just returns a P_.. value (see map.h)
… …
409 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 406 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
410 if (flag & P_OUT_OF_MAP) 407 if (flag & P_OUT_OF_MAP)
411 return P_OUT_OF_MAP; 408 return P_OUT_OF_MAP;
412 409
413 /* don't have object, so don't know what types would block */ 410 /* don't have object, so don't know what types would block */
414 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 411 return m1->at (sx, sy).move_block;
415 } 412 }
416 413
417 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 414 for (tmp = ob->arch; tmp; tmp = tmp->more)
418 { 415 {
419 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 416 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
420 417
421 if (flag & P_OUT_OF_MAP) 418 if (flag & P_OUT_OF_MAP)
422 return P_OUT_OF_MAP; 419 return P_OUT_OF_MAP;
423 if (flag & P_IS_ALIVE) 420 if (flag & P_IS_ALIVE)
424 return P_IS_ALIVE; 421 return P_IS_ALIVE;
425 422
423 mapspace &ms = m1->at (sx, sy);
424
425
426 /* find_first_free_spot() calls this function. However, often 426 /* find_first_free_spot() calls this function. However, often
427 * ob doesn't have any move type (when used to place exits) 427 * 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. 428 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
429 */ 429 */
430 430
431 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 431 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
432 continue; 432 continue;
433 433
434 /* Note it is intentional that we check ob - the movement type of the 434 /* Note it is intentional that we check ob - the movement type of the
435 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
436 */ 436 */
437 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 437 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
438 return P_NO_PASS; 438 return P_NO_PASS;
439 } 439 }
440 440
441 return 0; 441 return 0;
442} 442}
… …
472 * for objects whose arch says they are multipart yet according to the 472 * for objects whose arch says they are multipart yet according to the
473 * info we have, they only have the head (as would be expected when 473 * info we have, they only have the head (as would be expected when
474 * they are saved). We do have to look for the old maps that did save 474 * they are saved). We do have to look for the old maps that did save
475 * the more sections and not re-add sections for them. 475 * the more sections and not re-add sections for them.
476 */ 476 */
477
478static void 477static void
479link_multipart_objects (maptile *m) 478link_multipart_objects (maptile *m)
480{ 479{
481 int x, y; 480 int x, y;
482 object *tmp, *op, *last, *above; 481 object *tmp, *op, *last, *above;
483 archetype *at; 482 archetype *at;
484 483
485 for (x = 0; x < MAP_WIDTH (m); x++) 484 for (x = 0; x < m->width; x++)
486 for (y = 0; y < MAP_HEIGHT (m); y++) 485 for (y = 0; y < m->height; y++)
487 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) 486 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
488 { 487 {
489 above = tmp->above; 488 above = tmp->above;
490 489
491 /* already multipart - don't do anything more */ 490 /* already multipart - don't do anything more */
… …
542 { 541 {
543 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 542 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
544 continue; 543 continue;
545 } 544 }
546 545
547
548 switch (i) 546 switch (i)
549 { 547 {
550 case LL_NORMAL: 548 case LL_NORMAL:
551 /* if we are loading an overlay, put the floors on the bottom */ 549 /* 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) 550 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
… …
598 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 596 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
599 * and we only save the head of multi part objects - this is needed 597 * and we only save the head of multi part objects - this is needed
600 * in order to do map tiling properly. 598 * in order to do map tiling properly.
601 */ 599 */
602void 600void
603save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 601save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
604{ 602{
605 int i, j = 0, unique = 0; 603 int i, j = 0, unique = 0;
606 object *op; 604 object *op;
607 605
608 /* first pass - save one-part objects */ 606 /* first pass - save one-part objects */
609 for (i = 0; i < MAP_WIDTH (m); i++) 607 for (i = 0; i < m->width; i++)
610 for (j = 0; j < MAP_HEIGHT (m); j++) 608 for (j = 0; j < m->height; j++)
611 { 609 {
612 unique = 0; 610 unique = 0;
611
613 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 612 for (op = m->at (i, j).bot; op; op = op->above)
614 { 613 {
615 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 614 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
616 unique = 1; 615 unique = 1;
617 616
618 if (op->type == PLAYER) 617 if (op->type == PLAYER)
619 continue; 618 continue;
620 619
621 if (op->head || op->owner) 620 if (op->head || op->owner)
622 continue; 621 continue;
623 622
624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 623 if (unique || op->flag [FLAG_UNIQUE])
625 save_object (fp2, op, 3); 624 save_object (fp2, op, 1);
626 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 625 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
627 save_object (fp, op, 3); 626 save_object (fp, op, 1);
628 } 627 }
629 } 628 }
630} 629}
631 630
632maptile::maptile () 631maptile::maptile ()
633{ 632{
634 in_memory = MAP_SWAPPED; 633 in_memory = MAP_SWAPPED;
635 /* The maps used to pick up default x and y values from the 634 /* The maps used to pick up default x and y values from the
636 * map archetype. Mimic that behaviour. 635 * map archetype. Mimic that behaviour.
637 */ 636 */
638 MAP_WIDTH (this) = 16; 637 width = 16;
639 MAP_HEIGHT (this) = 16; 638 height = 16;
640 MAP_RESET_TIMEOUT (this) = 0; 639 reset_timeout = 0;
641 MAP_TIMEOUT (this) = 300; 640 timeout = 300;
642 MAP_ENTER_X (this) = 0; 641 enter_x = 0;
643 MAP_ENTER_Y (this) = 0; 642 enter_y = 0;
644 /*set part to -1 indicating conversion to weather map not yet done */ 643 /*set part to -1 indicating conversion to weather map not yet done */
645 MAP_WORLDPARTX (this) = -1; 644 worldpartx = -1;
646 MAP_WORLDPARTY (this) = -1; 645 worldparty = -1;
647} 646}
648 647
649/* 648/*
650 * Allocates, initialises, and returns a pointer to a maptile. 649 * Allocates, initialises, and returns a pointer to a maptile.
651 * Modified to no longer take a path option which was not being 650 * Modified to no longer take a path option which was not being
652 * used anyways. MSW 2001-07-01 651 * used anyways. MSW 2001-07-01
653 */ 652 */
654maptile * 653maptile *
655get_linked_map (void) 654get_linked_map (void)
656{ 655{
657 maptile *mp, *map = new maptile; 656 maptile *map = new maptile;
658 657
659 for (mp = first_map; mp && mp->next; mp = mp->next); 658 map->next = first_map;
660
661 if (mp == NULL)
662 first_map = map; 659 first_map = map;
663 else
664 mp->next = map;
665 660
666 return map; 661 return map;
667} 662}
668 663
669/* 664/*
… …
681 * that is their poor assumption. 676 * that is their poor assumption.
682 */ 677 */
683 if (spaces) 678 if (spaces)
684 { 679 {
685 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 680 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
686 free (spaces); 681 sfree (spaces, size ());
687 } 682 }
688 683
689 spaces = (mapspace *) 684 spaces = salloc0<mapspace> (size ());
690 calloc (1, width * height * sizeof (mapspace));
691
692 if (!spaces)
693 fatal (OUT_OF_MEMORY);
694} 685}
695 686
696/* Create and returns a map of the specific size. Used 687/* Create and returns a map of the specific size. Used
697 * in random map code and the editor. 688 * in random map code and the editor.
698 */ 689 */
… …
1121 strcpy (m->path, filename); 1112 strcpy (m->path, filename);
1122 if (load_map_header (thawer, m)) 1113 if (load_map_header (thawer, m))
1123 { 1114 {
1124 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1115 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1125 delete_map (m); 1116 delete_map (m);
1126 return NULL; 1117 return 0;
1127 } 1118 }
1128 1119
1129 m->allocate (); 1120 m->allocate ();
1130 1121
1131 m->in_memory = MAP_LOADING; 1122 m->in_memory = MAP_LOADING;
1132 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1123 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1133 1124
1134 m->in_memory = MAP_IN_MEMORY; 1125 m->in_memory = MAP_IN_MEMORY;
1135 if (!MAP_DIFFICULTY (m)) 1126 if (!m->difficulty)
1136 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1127 m->difficulty = calculate_difficulty (m);
1137 set_map_reset_time (m); 1128 set_map_reset_time (m);
1138 m->instantiate (); 1129 m->instantiate ();
1139 return (m); 1130 return (m);
1140} 1131}
1141 1132
… …
1214 if (load_map_header (thawer, m)) 1205 if (load_map_header (thawer, m))
1215 { 1206 {
1216 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1207 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1217 delete_map (m); 1208 delete_map (m);
1218 m = load_original_map (m->path, 0); 1209 m = load_original_map (m->path, 0);
1219 return NULL; 1210 return 0;
1220 } 1211 }
1221 /*m->allocate ();*/ 1212 /*m->allocate ();*/
1222 1213
1223 m->in_memory = MAP_LOADING; 1214 m->in_memory = MAP_LOADING;
1224 load_objects (m, thawer, MAP_OVERLAY); 1215 load_objects (m, thawer, MAP_OVERLAY);
… …
1236delete_unique_items (maptile *m) 1227delete_unique_items (maptile *m)
1237{ 1228{
1238 int i, j, unique; 1229 int i, j, unique;
1239 object *op, *next; 1230 object *op, *next;
1240 1231
1241 for (i = 0; i < MAP_WIDTH (m); i++) 1232 for (i = 0; i < m->width; i++)
1242 for (j = 0; j < MAP_HEIGHT (m); j++) 1233 for (j = 0; j < m->height; j++)
1243 { 1234 {
1244 unique = 0; 1235 unique = 0;
1245 1236
1246 for (op = GET_MAP_OB (m, i, j); op; op = next) 1237 for (op = GET_MAP_OB (m, i, j); op; op = next)
1247 { 1238 {
… …
1250 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1241 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1251 unique = 1; 1242 unique = 1;
1252 1243
1253 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1244 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1254 { 1245 {
1255 clean_object (op); 1246 op->destroy_inv (false);
1256
1257 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1258 remove_button_link (op);
1259
1260 op->destroy (); 1247 op->destroy ();
1261 } 1248 }
1262 } 1249 }
1263 } 1250 }
1264} 1251}
1265 1252
1266
1267/* 1253/*
1268 * Loads unique objects from file(s) into the map which is in memory 1254 * Loads unique objects from file(s) into the map which is in memory
1269 * m is the map to load unique items into. 1255 * m is the map to load unique items into.
1270 */ 1256 */
1271static void 1257static void
… …
1290 return; 1276 return;
1291 1277
1292 m->in_memory = MAP_LOADING; 1278 m->in_memory = MAP_LOADING;
1293 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1279 if (m->tmpname == NULL) /* if we have loaded unique items from */
1294 delete_unique_items (m); /* original map before, don't duplicate them */ 1280 delete_unique_items (m); /* original map before, don't duplicate them */
1281
1295 load_objects (m, thawer, 0); 1282 load_objects (m, thawer, 0);
1296 1283
1297 m->in_memory = MAP_IN_MEMORY; 1284 m->in_memory = MAP_IN_MEMORY;
1298} 1285}
1299
1300 1286
1301/* 1287/*
1302 * Saves a map to file. If flag is set, it is saved into the same 1288 * 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 1289 * file it was (originally) loaded from. Otherwise a temporary
1304 * filename will be genarated, and the file will be stored there. 1290 * filename will be genarated, and the file will be stored there.
1305 * The temporary filename will be stored in the maptileure. 1291 * The temporary filename will be stored in the maptileure.
1306 * If the map is unique, we also save to the filename in the map 1292 * If the map is unique, we also save to the filename in the map
1307 * (this should have been updated when first loaded) 1293 * (this should have been updated when first loaded)
1308 */ 1294 */
1309
1310int 1295int
1311new_save_map (maptile *m, int flag) 1296new_save_map (maptile *m, int flag)
1312{ 1297{
1313 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1298 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1314 int i; 1299 int i;
… …
1446 freezer.save (filename); 1431 freezer.save (filename);
1447 1432
1448 return 0; 1433 return 0;
1449} 1434}
1450 1435
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/* 1436/*
1475 * Remove and free all objects in the given map. 1437 * Remove and free all objects in the given map.
1476 */ 1438 */
1477
1478void 1439void
1479free_all_objects (maptile *m) 1440free_all_objects (maptile *m)
1480{ 1441{
1481 int i, j; 1442 if (!m->spaces)
1482 object *op; 1443 return;
1483 1444
1484 for (i = 0; i < MAP_WIDTH (m); i++) 1445 for (int i = 0; i < m->width; i++)
1485 for (j = 0; j < MAP_HEIGHT (m); j++) 1446 for (int j = 0; j < m->height; j++)
1486 { 1447 {
1487 object *previous_obj = NULL; 1448 mapspace &ms = m->at (i, j);
1488 1449
1489 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1450 while (object *op = ms.bot)
1490 { 1451 {
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) 1452 if (op->head)
1500 op = op->head; 1453 op = op->head;
1501 1454
1502 /* If the map isn't in memory, free_object will remove and 1455 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 (); 1456 op->destroy ();
1509 } 1457 }
1510 } 1458 }
1511} 1459}
1512 1460
1513/* 1461/*
1514 * Frees everything allocated by the given maptileure. 1462 * Frees everything allocated by the given maptileure.
1515 * don't free tmpname - our caller is left to do that 1463 * don't free tmpname - our caller is left to do that
1516 */ 1464 */
1517
1518void 1465void
1519free_map (maptile *m, int flag) 1466free_map (maptile *m, int flag)
1520{ 1467{
1521 int i; 1468 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; 1469 return;
1527 } 1470
1471 m->in_memory = MAP_SAVING;
1528 1472
1529 // TODO: use new/delete 1473 // TODO: use new/delete
1530#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531 1474
1532 if (flag && m->spaces) 1475 if (flag && m->spaces)
1533 free_all_objects (m); 1476 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 1477
1543 delete [] m->shopitems; 1478 sfree (m->spaces, m->size ()), m->spaces = 0;
1544 m->shopitems = 0;
1545 1479
1546 if (m->shoprace) 1480 free (m->name), m->name = 0;
1547 FREE_AND_CLEAR (m->shoprace); 1481 free (m->msg), m->msg = 0;
1482 free (m->maplore), m->maplore = 0;
1483 free (m->shoprace), m->shoprace = 0;
1484 delete [] m->shopitems, m->shopitems = 0;
1548 1485
1549 if (m->buttons) 1486 if (m->buttons)
1550 free_objectlinkpt (m->buttons); 1487 free_objectlinkpt (m->buttons), m->buttons = 0;
1551 1488
1552 m->buttons = NULL;
1553
1554 for (i = 0; i < 4; i++) 1489 for (int i = 0; i < 4; i++)
1555 { 1490 free (m->tile_path[i]), m->tile_path[i] = 0;
1556 if (m->tile_path[i])
1557 FREE_AND_CLEAR (m->tile_path[i]);
1558 m->tile_map[i] = NULL;
1559 }
1560 1491
1561 m->in_memory = MAP_SWAPPED; 1492 m->in_memory = MAP_SWAPPED;
1562
1563#undef FREE_AND_CLEAR
1564
1565} 1493}
1566 1494
1567/* 1495maptile::~maptile ()
1568 * function: vanish maptile 1496{
1569 * m : pointer to maptile, if NULL no action 1497 assert (destroyed ());
1570 * this deletes all the data on the map (freeing pointers) 1498}
1571 * and then removes this map from the global linked list of maps. 1499
1500void
1501maptile::do_destroy ()
1502{
1503 attachable::do_destroy ();
1504
1505 free_map (this, 1);
1506 free (tmpname), tmpname = 0;
1507
1508 /* We need to look through all the maps and see if any maps
1509 * are pointing at this one for tiling information. Since
1510 * tiling can be asymetric, we just can not look to see which
1511 * maps this map tiles with and clears those.
1572 */ 1512 */
1513 //TODO: non-euclidean-tiling MUST GO
1514 for_all_maps (m)
1515 for (int i = 0; i < 4; i++)
1516 if (m->tile_map[i] == this)
1517 m->tile_map[i] = 0;
1573 1518
1519 if (first_map == this)
1520 first_map = next;
1521 else
1522 for_all_maps (m)
1523 if (m->next = this)
1524 {
1525 m->next = next;
1526 break;
1527 }
1528}
1529
1530//TODO: must go
1574void 1531void
1575delete_map (maptile *m) 1532delete_map (maptile *m)
1576{ 1533{
1577 maptile *tmp, *last;
1578 int i;
1579
1580 if (!m) 1534 if (m)
1581 return; 1535 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} 1536}
1634 1537
1635/* 1538/*
1636 * Makes sure the given map is loaded and swapped in. 1539 * Makes sure the given map is loaded and swapped in.
1637 * name is path name of the map. 1540 * name is path name of the map.
… …
1644 * Returns a pointer to the given map. 1547 * Returns a pointer to the given map.
1645 */ 1548 */
1646maptile * 1549maptile *
1647ready_map_name (const char *name, int flags) 1550ready_map_name (const char *name, int flags)
1648{ 1551{
1649 maptile *m;
1650
1651 if (!name) 1552 if (!name)
1652 return (NULL); 1553 return 0;
1653 1554
1654 /* Have we been at this level before? */ 1555 /* Have we been at this level before? */
1655 m = has_been_loaded (name); 1556 maptile *m = has_been_loaded (name);
1656 1557
1657 /* Map is good to go, so just return it */ 1558 /* Map is good to go, so just return it */
1658 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1559 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1659 {
1660 return m; 1560 return m;
1661 }
1662 1561
1663 /* unique maps always get loaded from their original location, and never 1562 /* 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 1563 * 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 - 1564 * 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 1565 * 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 1567 * 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. 1568 * resets in any case - if they really care, they should use the 'maps command.
1670 */ 1569 */
1671 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1570 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1672 { 1571 {
1673
1674 /* first visit or time to reset */ 1572 /* first visit or time to reset */
1675 if (m) 1573 if (m)
1676 { 1574 {
1677 clean_tmp_map (m); /* Doesn't make much difference */ 1575 clean_tmp_map (m); /* Doesn't make much difference */
1678 delete_map (m); 1576 delete_map (m);
… …
1765 int x, y, i; 1663 int x, y, i;
1766 long monster_cnt = 0; 1664 long monster_cnt = 0;
1767 double avgexp = 0; 1665 double avgexp = 0;
1768 sint64 total_exp = 0; 1666 sint64 total_exp = 0;
1769 1667
1770 if (MAP_DIFFICULTY (m)) 1668 if (m->difficulty)
1771 { 1669 {
1772 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1670 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1773 return MAP_DIFFICULTY (m); 1671 return m->difficulty;
1774 } 1672 }
1775 1673
1776 for (x = 0; x < MAP_WIDTH (m); x++) 1674 for (x = 0; x < m->width; x++)
1777 for (y = 0; y < MAP_HEIGHT (m); y++) 1675 for (y = 0; y < m->height; y++)
1778 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 1676 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1779 { 1677 {
1780 if (QUERY_FLAG (op, FLAG_MONSTER)) 1678 if (QUERY_FLAG (op, FLAG_MONSTER))
1781 { 1679 {
1782 total_exp += op->stats.exp; 1680 total_exp += op->stats.exp;
… …
1831 if (first_map->in_memory == MAP_SAVING) 1729 if (first_map->in_memory == MAP_SAVING)
1832 first_map->in_memory = MAP_IN_MEMORY; 1730 first_map->in_memory = MAP_IN_MEMORY;
1833 delete_map (first_map); 1731 delete_map (first_map);
1834 real_maps++; 1732 real_maps++;
1835 } 1733 }
1734
1836 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1735 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1837} 1736}
1838 1737
1839/* change_map_light() - used to change map light level (darkness) 1738/* change_map_light() - used to change map light level (darkness)
1840 * up or down. Returns true if successful. It should now be 1739 * up or down. Returns true if successful. It should now be
… …
1899 1798
1900 middle_obj = 0; 1799 middle_obj = 0;
1901 top_obj = 0; 1800 top_obj = 0;
1902 floor_obj = 0; 1801 floor_obj = 0;
1903 1802
1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) 1803 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1905 { 1804 {
1906 /* This could be made additive I guess (two lights better than 1805 /* This could be made additive I guess (two lights better than
1907 * one). But if so, it shouldn't be a simple additive - 2 1806 * one). But if so, it shouldn't be a simple additive - 2
1908 * light bulbs do not illuminate twice as far as once since 1807 * light bulbs do not illuminate twice as far as once since
1909 * it is a dissapation factor that is cubed. 1808 * it is a dissapation factor that is cubed.
… …
2059void 1958void
2060set_map_reset_time (maptile *map) 1959set_map_reset_time (maptile *map)
2061{ 1960{
2062 int timeout; 1961 int timeout;
2063 1962
2064 timeout = MAP_RESET_TIMEOUT (map); 1963 timeout = map->reset_timeout;
2065 if (timeout <= 0) 1964 if (timeout <= 0)
2066 timeout = MAP_DEFAULTRESET; 1965 timeout = MAP_DEFAULTRESET;
2067 if (timeout >= MAP_MAXRESET) 1966 if (timeout >= MAP_MAXRESET)
2068 timeout = MAP_MAXRESET; 1967 timeout = MAP_MAXRESET;
2069 MAP_WHEN_RESET (map) = time (0) + timeout; 1968 map->reset_time = time (0) + timeout;
2070} 1969}
2071 1970
2072/* this updates the orig_map->tile_map[tile_num] value after loading 1971/* 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 1972 * 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 1973 * maps tile_map values if it tiles back to this one. It returns
… …
2117 return 1; 2016 return 1;
2118 2017
2119 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2018 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2120 load_and_link_tiled_map (m, 3); 2019 load_and_link_tiled_map (m, 3);
2121 2020
2122 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2021 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2123 } 2022 }
2124 2023
2125 if (x >= MAP_WIDTH (m)) 2024 if (x >= m->width)
2126 { 2025 {
2127 if (!m->tile_path[1]) 2026 if (!m->tile_path[1])
2128 return 1; 2027 return 1;
2129 2028
2130 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2029 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2131 load_and_link_tiled_map (m, 1); 2030 load_and_link_tiled_map (m, 1);
2132 2031
2133 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2032 return (out_of_map (m->tile_map[1], x - m->width, y));
2134 } 2033 }
2135 2034
2136 if (y < 0) 2035 if (y < 0)
2137 { 2036 {
2138 if (!m->tile_path[0]) 2037 if (!m->tile_path[0])
2139 return 1; 2038 return 1;
2140 2039
2141 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2040 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2142 load_and_link_tiled_map (m, 0); 2041 load_and_link_tiled_map (m, 0);
2143 2042
2144 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2043 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2145 } 2044 }
2146 2045
2147 if (y >= MAP_HEIGHT (m)) 2046 if (y >= m->height)
2148 { 2047 {
2149 if (!m->tile_path[2]) 2048 if (!m->tile_path[2])
2150 return 1; 2049 return 1;
2151 2050
2152 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2051 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2153 load_and_link_tiled_map (m, 2); 2052 load_and_link_tiled_map (m, 2);
2154 2053
2155 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2054 return (out_of_map (m->tile_map[2], x, y - m->height));
2156 } 2055 }
2157 2056
2158 /* Simple case - coordinates are within this local 2057 /* Simple case - coordinates are within this local
2159 * map. 2058 * map.
2160 */ 2059 */
… …
2178 if (!m->tile_path[3]) 2077 if (!m->tile_path[3])
2179 return 0; 2078 return 0;
2180 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2079 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2181 load_and_link_tiled_map (m, 3); 2080 load_and_link_tiled_map (m, 3);
2182 2081
2183 *x += MAP_WIDTH (m->tile_map[3]); 2082 *x += m->tile_map[3]->width;
2184 return (get_map_from_coord (m->tile_map[3], x, y)); 2083 return (get_map_from_coord (m->tile_map[3], x, y));
2185 } 2084 }
2186 2085
2187 if (*x >= MAP_WIDTH (m)) 2086 if (*x >= m->width)
2188 { 2087 {
2189 if (!m->tile_path[1]) 2088 if (!m->tile_path[1])
2190 return 0; 2089 return 0;
2191 2090
2192 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2091 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2193 load_and_link_tiled_map (m, 1); 2092 load_and_link_tiled_map (m, 1);
2194 2093
2195 *x -= MAP_WIDTH (m); 2094 *x -= m->width;
2196 return (get_map_from_coord (m->tile_map[1], x, y)); 2095 return (get_map_from_coord (m->tile_map[1], x, y));
2197 } 2096 }
2198 2097
2199 if (*y < 0) 2098 if (*y < 0)
2200 { 2099 {
… …
2202 return 0; 2101 return 0;
2203 2102
2204 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2103 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2205 load_and_link_tiled_map (m, 0); 2104 load_and_link_tiled_map (m, 0);
2206 2105
2207 *y += MAP_HEIGHT (m->tile_map[0]); 2106 *y += m->tile_map[0]->height;
2208 return (get_map_from_coord (m->tile_map[0], x, y)); 2107 return (get_map_from_coord (m->tile_map[0], x, y));
2209 } 2108 }
2210 2109
2211 if (*y >= MAP_HEIGHT (m)) 2110 if (*y >= m->height)
2212 { 2111 {
2213 if (!m->tile_path[2]) 2112 if (!m->tile_path[2])
2214 return 0; 2113 return 0;
2215 2114
2216 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2115 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2217 load_and_link_tiled_map (m, 2); 2116 load_and_link_tiled_map (m, 2);
2218 2117
2219 *y -= MAP_HEIGHT (m); 2118 *y -= m->height;
2220 return (get_map_from_coord (m->tile_map[2], x, y)); 2119 return (get_map_from_coord (m->tile_map[2], x, y));
2221 } 2120 }
2222 2121
2223 /* Simple case - coordinates are within this local 2122 /* Simple case - coordinates are within this local
2224 * map. 2123 * map.
… …
2244 2143
2245 } 2144 }
2246 else if (map1->tile_map[0] == map2) 2145 else if (map1->tile_map[0] == map2)
2247 { /* up */ 2146 { /* up */
2248 *dx = 0; 2147 *dx = 0;
2249 *dy = -MAP_HEIGHT (map2); 2148 *dy = -map2->height;
2250 } 2149 }
2251 else if (map1->tile_map[1] == map2) 2150 else if (map1->tile_map[1] == map2)
2252 { /* right */ 2151 { /* right */
2253 *dx = MAP_WIDTH (map1); 2152 *dx = map1->width;
2254 *dy = 0; 2153 *dy = 0;
2255 } 2154 }
2256 else if (map1->tile_map[2] == map2) 2155 else if (map1->tile_map[2] == map2)
2257 { /* down */ 2156 { /* down */
2258 *dx = 0; 2157 *dx = 0;
2259 *dy = MAP_HEIGHT (map1); 2158 *dy = map1->height;
2260 } 2159 }
2261 else if (map1->tile_map[3] == map2) 2160 else if (map1->tile_map[3] == map2)
2262 { /* left */ 2161 { /* left */
2263 *dx = -MAP_WIDTH (map2); 2162 *dx = -map2->width;
2264 *dy = 0; 2163 *dy = 0;
2265 2164
2266 } 2165 }
2267 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2166 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2268 { /* up right */ 2167 { /* up right */
2269 *dx = MAP_WIDTH (map1->tile_map[0]); 2168 *dx = map1->tile_map[0]->width;
2270 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2169 *dy = -map1->tile_map[0]->height;
2271 } 2170 }
2272 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2171 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2273 { /* up left */ 2172 { /* up left */
2274 *dx = -MAP_WIDTH (map2); 2173 *dx = -map2->width;
2275 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2174 *dy = -map1->tile_map[0]->height;
2276 } 2175 }
2277 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2176 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2278 { /* right up */ 2177 { /* right up */
2279 *dx = MAP_WIDTH (map1); 2178 *dx = map1->width;
2280 *dy = -MAP_HEIGHT (map2); 2179 *dy = -map2->height;
2281 } 2180 }
2282 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2181 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2283 { /* right down */ 2182 { /* right down */
2284 *dx = MAP_WIDTH (map1); 2183 *dx = map1->width;
2285 *dy = MAP_HEIGHT (map1->tile_map[1]); 2184 *dy = map1->tile_map[1]->height;
2286 } 2185 }
2287 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2186 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2288 { /* down right */ 2187 { /* down right */
2289 *dx = MAP_WIDTH (map1->tile_map[2]); 2188 *dx = map1->tile_map[2]->width;
2290 *dy = MAP_HEIGHT (map1); 2189 *dy = map1->height;
2291 } 2190 }
2292 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2191 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2293 { /* down left */ 2192 { /* down left */
2294 *dx = -MAP_WIDTH (map2); 2193 *dx = -map2->width;
2295 *dy = MAP_HEIGHT (map1); 2194 *dy = map1->height;
2296 } 2195 }
2297 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2196 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2298 { /* left up */ 2197 { /* left up */
2299 *dx = -MAP_WIDTH (map1->tile_map[3]); 2198 *dx = -map1->tile_map[3]->width;
2300 *dy = -MAP_HEIGHT (map2); 2199 *dy = -map2->height;
2301 } 2200 }
2302 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2201 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2303 { /* left down */ 2202 { /* left down */
2304 *dx = -MAP_WIDTH (map1->tile_map[3]); 2203 *dx = -map1->tile_map[3]->width;
2305 *dy = MAP_HEIGHT (map1->tile_map[3]); 2204 *dy = map1->tile_map[3]->height;
2306 2205
2307 } 2206 }
2308 else 2207 else
2309 { /* not "adjacent" enough */ 2208 { /* not "adjacent" enough */
2310 return 0; 2209 return 0;
… …
2435{ 2334{
2436 int dx, dy; 2335 int dx, dy;
2437 2336
2438 return adjacent_map (op1->map, op2->map, &dx, &dy); 2337 return adjacent_map (op1->map, op2->map, &dx, &dy);
2439} 2338}
2339
2340object *
2341maptile::insert (object *op, int x, int y, object *originator, int flags)
2342{
2343 if (!op->flag [FLAG_REMOVED])
2344 op->remove ();
2345
2346 return insert_ob_in_map_at (op, this, originator, flags, x, y);
2347}
2348

Diff Legend

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