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.47 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.54 by root, Wed Dec 27 13:13:46 2006 UTC

… …
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
23 23
24
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
28#include <loader.h> 27#include <loader.h>
29#include <unistd.h> 28#include <unistd.h>
… …
32 31
33/* 32/*
34 * Returns the maptile which has a name matching the given argument. 33 * Returns the maptile which has a name matching the given argument.
35 * return NULL if no match is found. 34 * return NULL if no match is found.
36 */ 35 */
37
38maptile * 36maptile *
39has_been_loaded (const char *name) 37has_been_loaded (const char *name)
40{ 38{
41 maptile *map;
42
43 if (!name || !*name) 39 if (!name || !*name)
44 return 0; 40 return 0;
45 for (map = first_map; map; map = map->next) 41
42 for_all_maps (map)
46 if (!strcmp (name, map->path)) 43 if (!strcmp (name, map->path))
47 break;
48 return (map); 44 return map;
45
46 return 0;
49} 47}
50 48
51/* 49/*
52 * This makes a path absolute outside the world of Crossfire. 50 * This makes a path absolute outside the world of Crossfire.
53 * In other words, it prepends LIBDIR/MAPDIR/ to the given path 51 * In other words, it prepends LIBDIR/MAPDIR/ to the given path
… …
196 194
197void 195void
198dump_map (const maptile *m) 196dump_map (const maptile *m)
199{ 197{
200 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 198 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)); 199 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y);
202 200
203 if (m->msg != NULL) 201 if (m->msg != NULL)
204 LOG (llevError, "Message:\n%s", m->msg); 202 LOG (llevError, "Message:\n%s", m->msg);
205 203
206 if (m->maplore != NULL) 204 if (m->maplore != NULL)
… …
220 */ 218 */
221 219
222void 220void
223dump_all_maps (void) 221dump_all_maps (void)
224{ 222{
225 maptile *m; 223 for_all_maps (m)
226
227 for (m = first_map; m; m = m->next)
228 dump_map (m); 224 dump_map (m);
229} 225}
230 226
231/* This rolls up wall, blocks_magic, blocks_view, etc, all into 227/* This rolls up wall, blocks_magic, blocks_view, etc, all into
232 * one function that just returns a P_.. value (see map.h) 228 * one function that just returns a P_.. value (see map.h)
… …
475 * for objects whose arch says they are multipart yet according to the 471 * for objects whose arch says they are multipart yet according to the
476 * info we have, they only have the head (as would be expected when 472 * info we have, they only have the head (as would be expected when
477 * they are saved). We do have to look for the old maps that did save 473 * they are saved). We do have to look for the old maps that did save
478 * the more sections and not re-add sections for them. 474 * the more sections and not re-add sections for them.
479 */ 475 */
480
481static void 476static void
482link_multipart_objects (maptile *m) 477link_multipart_objects (maptile *m)
483{ 478{
484 int x, y; 479 int x, y;
485 object *tmp, *op, *last, *above; 480 object *tmp, *op, *last, *above;
486 archetype *at; 481 archetype *at;
487 482
488 for (x = 0; x < MAP_WIDTH (m); x++) 483 for (x = 0; x < m->width; x++)
489 for (y = 0; y < MAP_HEIGHT (m); y++) 484 for (y = 0; y < m->height; y++)
490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) 485 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
491 { 486 {
492 above = tmp->above; 487 above = tmp->above;
493 488
494 /* already multipart - don't do anything more */ 489 /* already multipart - don't do anything more */
… …
600 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 595 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
601 * and we only save the head of multi part objects - this is needed 596 * and we only save the head of multi part objects - this is needed
602 * in order to do map tiling properly. 597 * in order to do map tiling properly.
603 */ 598 */
604void 599void
605save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 600save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
606{ 601{
607 int i, j = 0, unique = 0; 602 int i, j = 0, unique = 0;
608 object *op; 603 object *op;
609 604
610 /* first pass - save one-part objects */ 605 /* first pass - save one-part objects */
611 for (i = 0; i < MAP_WIDTH (m); i++) 606 for (i = 0; i < m->width; i++)
612 for (j = 0; j < MAP_HEIGHT (m); j++) 607 for (j = 0; j < m->height; j++)
613 { 608 {
614 unique = 0; 609 unique = 0;
610
615 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 611 for (op = m->at (i, j).bot; op; op = op->above)
616 { 612 {
617 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 613 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
618 unique = 1; 614 unique = 1;
619 615
620 if (op->type == PLAYER) 616 if (!op->can_map_save ())
621 continue; 617 continue;
622 618
623 if (op->head || op->owner)
624 continue;
625
626 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 619 if (unique || op->flag [FLAG_UNIQUE])
627 save_object (fp2, op, 3); 620 save_object (fp2, op, 1);
628 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 621 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
629 save_object (fp, op, 3); 622 save_object (fp, op, 1);
630 } 623 }
631 } 624 }
632} 625}
633 626
634maptile::maptile () 627maptile::maptile ()
635{ 628{
636 in_memory = MAP_SWAPPED; 629 in_memory = MAP_SWAPPED;
630
637 /* The maps used to pick up default x and y values from the 631 /* The maps used to pick up default x and y values from the
638 * map archetype. Mimic that behaviour. 632 * map archetype. Mimic that behaviour.
639 */ 633 */
640 MAP_WIDTH (this) = 16; 634 width = 16;
641 MAP_HEIGHT (this) = 16; 635 height = 16;
642 MAP_RESET_TIMEOUT (this) = 0; 636 reset_timeout = 0;
643 MAP_TIMEOUT (this) = 300; 637 timeout = 300;
644 MAP_ENTER_X (this) = 0; 638 enter_x = 0;
645 MAP_ENTER_Y (this) = 0; 639 enter_y = 0;
646 /*set part to -1 indicating conversion to weather map not yet done */ 640 /*set part to -1 indicating conversion to weather map not yet done */
647 MAP_WORLDPARTX (this) = -1; 641 worldpartx = -1;
648 MAP_WORLDPARTY (this) = -1; 642 worldparty = -1;
643}
644
645void
646maptile::link ()
647{
648 next = first_map;
649 first_map = this;
650}
651
652void
653maptile::unlink ()
654{
655 if (first_map == this)
656 first_map = next;
657 else
658 for_all_maps (m)
659 if (m->next = this)
660 {
661 m->next = next;
662 break;
663 }
649} 664}
650 665
651/* 666/*
652 * Allocates, initialises, and returns a pointer to a maptile. 667 * Allocates, initialises, and returns a pointer to a maptile.
653 * Modified to no longer take a path option which was not being 668 * Modified to no longer take a path option which was not being
654 * used anyways. MSW 2001-07-01 669 * used anyways. MSW 2001-07-01
655 */ 670 */
656maptile * 671maptile *
657get_linked_map (void) 672get_linked_map (void)
658{ 673{
659 maptile *mp, *map = new maptile; 674 maptile *map = new maptile;
660 675 map->link ();
661 for (mp = first_map; mp && mp->next; mp = mp->next);
662
663 if (mp == NULL)
664 first_map = map;
665 else
666 mp->next = map;
667
668 return map; 676 return map;
669} 677}
670 678
671/* 679/*
672 * Allocates the arrays contained in a maptile. 680 * Allocates the arrays contained in a maptile.
… …
683 * that is their poor assumption. 691 * that is their poor assumption.
684 */ 692 */
685 if (spaces) 693 if (spaces)
686 { 694 {
687 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 695 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
688 free (spaces); 696 sfree (spaces, size ());
689 } 697 }
690 698
691 spaces = (mapspace *) 699 spaces = salloc0<mapspace> (size ());
692 calloc (1, width * height * sizeof (mapspace));
693
694 if (!spaces)
695 fatal (OUT_OF_MEMORY);
696} 700}
697 701
698/* Create and returns a map of the specific size. Used 702/* Create and returns a map of the specific size. Used
699 * in random map code and the editor. 703 * in random map code and the editor.
700 */ 704 */
… …
733 p = strchr (p, ';'); 737 p = strchr (p, ';');
734 number_of_entries++; 738 number_of_entries++;
735 if (p) 739 if (p)
736 p++; 740 p++;
737 } 741 }
742
738 p = shop_string; 743 p = shop_string;
739 strip_endline (p); 744 strip_endline (p);
740 items = new shopitems[number_of_entries + 1]; 745 items = new shopitems[number_of_entries + 1];
741 for (i = 0; i < number_of_entries; i++) 746 for (i = 0; i < number_of_entries; i++)
742 { 747 {
743 if (!p) 748 if (!p)
744 { 749 {
745 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); 750 LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n");
746 break; 751 break;
747 } 752 }
753
748 next_semicolon = strchr (p, ';'); 754 next_semicolon = strchr (p, ';');
749 next_colon = strchr (p, ':'); 755 next_colon = strchr (p, ':');
750 /* if there is a stregth specified, figure out what it is, we'll need it soon. */ 756 /* if there is a stregth specified, figure out what it is, we'll need it soon. */
751 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 757 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
752 items[i].strength = atoi (strchr (p, ':') + 1); 758 items[i].strength = atoi (strchr (p, ':') + 1);
… …
779 * the next entry while we're at it, better print a warning 785 * the next entry while we're at it, better print a warning
780 */ 786 */
781 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 787 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
782 } 788 }
783 } 789 }
790
784 items[i].index = number_of_entries; 791 items[i].index = number_of_entries;
785 if (next_semicolon) 792 if (next_semicolon)
786 p = ++next_semicolon; 793 p = ++next_semicolon;
787 else 794 else
788 p = NULL; 795 p = NULL;
789 } 796 }
797
790 free (shop_string); 798 free (shop_string);
791 return items; 799 return items;
792} 800}
793 801
794/* opposite of parse string, this puts the string that was originally fed in to 802/* opposite of parse string, this puts the string that was originally fed in to
… …
803 for (i = 0; i < m->shopitems[0].index; i++) 811 for (i = 0; i < m->shopitems[0].index; i++)
804 { 812 {
805 if (m->shopitems[i].typenum) 813 if (m->shopitems[i].typenum)
806 { 814 {
807 if (m->shopitems[i].strength) 815 if (m->shopitems[i].strength)
808 {
809 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 816 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
810 }
811 else 817 else
812 sprintf (tmp, "%s;", m->shopitems[i].name); 818 sprintf (tmp, "%s;", m->shopitems[i].name);
813 } 819 }
814 else 820 else
815 { 821 {
816 if (m->shopitems[i].strength) 822 if (m->shopitems[i].strength)
817 {
818 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 823 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
819 }
820 else 824 else
821 sprintf (tmp, "*"); 825 sprintf (tmp, "*");
822 } 826 }
827
823 strcat (output_string, tmp); 828 strcat (output_string, tmp);
824 } 829 }
825} 830}
826 831
827/* This loads the header information of the map. The header 832/* This loads the header information of the map. The header
… …
1095 * MAP_BLOCK, in which case we block on this load. This happens in all 1100 * MAP_BLOCK, in which case we block on this load. This happens in all
1096 * cases, no matter if this flag is set or not. 1101 * cases, no matter if this flag is set or not.
1097 * MAP_STYLE: style map - don't add active objects, don't add to server 1102 * MAP_STYLE: style map - don't add active objects, don't add to server
1098 * managed map list. 1103 * managed map list.
1099 */ 1104 */
1100
1101maptile * 1105maptile *
1102load_original_map (const char *filename, int flags) 1106load_original_map (const char *filename, int flags)
1103{ 1107{
1104 maptile *m; 1108 maptile *m;
1105 char pathname[MAX_BUF]; 1109 char pathname[MAX_BUF];
… …
1132 1136
1133 m->in_memory = MAP_LOADING; 1137 m->in_memory = MAP_LOADING;
1134 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1138 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1135 1139
1136 m->in_memory = MAP_IN_MEMORY; 1140 m->in_memory = MAP_IN_MEMORY;
1137 if (!MAP_DIFFICULTY (m)) 1141 if (!m->difficulty)
1138 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1142 m->difficulty = calculate_difficulty (m);
1139 set_map_reset_time (m); 1143 set_map_reset_time (m);
1140 m->instantiate (); 1144 m->instantiate ();
1141 return (m); 1145 return (m);
1142} 1146}
1143 1147
1144/* 1148/*
1145 * Loads a map, which has been loaded earlier, from file. 1149 * Loads a map, which has been loaded earlier, from file.
1146 * Return the map object we load into (this can change from the passed 1150 * Return the map object we load into (this can change from the passed
1147 * option if we can't find the original map) 1151 * option if we can't find the original map)
1148 */ 1152 */
1149
1150static maptile * 1153static maptile *
1151load_temporary_map (maptile *m) 1154load_temporary_map (maptile *m)
1152{ 1155{
1153 char buf[MAX_BUF]; 1156 char buf[MAX_BUF];
1154 1157
… …
1198/* 1201/*
1199 * Loads a map, which has been loaded earlier, from file. 1202 * Loads a map, which has been loaded earlier, from file.
1200 * Return the map object we load into (this can change from the passed 1203 * Return the map object we load into (this can change from the passed
1201 * option if we can't find the original map) 1204 * option if we can't find the original map)
1202 */ 1205 */
1203
1204maptile * 1206maptile *
1205load_overlay_map (const char *filename, maptile *m) 1207load_overlay_map (const char *filename, maptile *m)
1206{ 1208{
1207 char pathname[MAX_BUF]; 1209 char pathname[MAX_BUF];
1208 1210
… …
1238delete_unique_items (maptile *m) 1240delete_unique_items (maptile *m)
1239{ 1241{
1240 int i, j, unique; 1242 int i, j, unique;
1241 object *op, *next; 1243 object *op, *next;
1242 1244
1243 for (i = 0; i < MAP_WIDTH (m); i++) 1245 for (i = 0; i < m->width; i++)
1244 for (j = 0; j < MAP_HEIGHT (m); j++) 1246 for (j = 0; j < m->height; j++)
1245 { 1247 {
1246 unique = 0; 1248 unique = 0;
1247 1249
1248 for (op = GET_MAP_OB (m, i, j); op; op = next) 1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1249 { 1251 {
… …
1259 } 1261 }
1260 } 1262 }
1261 } 1263 }
1262} 1264}
1263 1265
1264
1265/* 1266/*
1266 * Loads unique objects from file(s) into the map which is in memory 1267 * Loads unique objects from file(s) into the map which is in memory
1267 * m is the map to load unique items into. 1268 * m is the map to load unique items into.
1268 */ 1269 */
1269static void 1270static void
… …
1288 return; 1289 return;
1289 1290
1290 m->in_memory = MAP_LOADING; 1291 m->in_memory = MAP_LOADING;
1291 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1292 delete_unique_items (m); /* original map before, don't duplicate them */ 1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1293 load_objects (m, thawer, 0); 1295 load_objects (m, thawer, 0);
1294 1296
1295 m->in_memory = MAP_IN_MEMORY; 1297 m->in_memory = MAP_IN_MEMORY;
1296} 1298}
1297
1298 1299
1299/* 1300/*
1300 * Saves a map to file. If flag is set, it is saved into the same 1301 * Saves a map to file. If flag is set, it is saved into the same
1301 * file it was (originally) loaded from. Otherwise a temporary 1302 * file it was (originally) loaded from. Otherwise a temporary
1302 * filename will be genarated, and the file will be stored there. 1303 * filename will be genarated, and the file will be stored there.
1303 * The temporary filename will be stored in the maptileure. 1304 * The temporary filename will be stored in the maptileure.
1304 * If the map is unique, we also save to the filename in the map 1305 * If the map is unique, we also save to the filename in the map
1305 * (this should have been updated when first loaded) 1306 * (this should have been updated when first loaded)
1306 */ 1307 */
1307
1308int 1308int
1309new_save_map (maptile *m, int flag) 1309new_save_map (maptile *m, int flag)
1310{ 1310{
1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1312 int i; 1312 int i;
… …
1453free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1454{ 1454{
1455 if (!m->spaces) 1455 if (!m->spaces)
1456 return; 1456 return;
1457 1457
1458 for (int i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1459 for (int j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1460 { 1460 {
1461 mapspace &ms = m->at (i, j); 1461 mapspace &ms = m->at (i, j);
1462 1462
1463 while (object *op = ms.bottom) 1463 while (object *op = ms.bot)
1464 { 1464 {
1465 if (op->head) 1465 if (op->head)
1466 op = op->head; 1466 op = op->head;
1467 1467
1468 op->destroy_inv (false); 1468 op->destroy_inv (false);
… …
1476 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1477 */ 1477 */
1478void 1478void
1479free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1480{ 1480{
1481 if (m->in_memory != MAP_IN_MEMORY) 1481 if (!m->in_memory) //TODO: makes no sense to me?
1482 return; 1482 return;
1483 1483
1484 m->in_memory = MAP_SAVING; 1484 m->in_memory = MAP_SAVING;
1485 1485
1486 // TODO: use new/delete 1486 // TODO: use new/delete
1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1488 1487
1489 if (flag && m->spaces) 1488 if (flag && m->spaces)
1490 free_all_objects (m); 1489 free_all_objects (m);
1491 if (m->name)
1492 FREE_AND_CLEAR (m->name);
1493 if (m->spaces)
1494 FREE_AND_CLEAR (m->spaces);
1495 if (m->msg)
1496 FREE_AND_CLEAR (m->msg);
1497 if (m->maplore)
1498 FREE_AND_CLEAR (m->maplore);
1499 1490
1500 delete [] m->shopitems; 1491 sfree (m->spaces, m->size ()), m->spaces = 0;
1501 m->shopitems = 0;
1502 1492
1503 if (m->shoprace) 1493 free (m->name), m->name = 0;
1504 FREE_AND_CLEAR (m->shoprace); 1494 free (m->msg), m->msg = 0;
1495 free (m->maplore), m->maplore = 0;
1496 free (m->shoprace), m->shoprace = 0;
1497 delete [] m->shopitems, m->shopitems = 0;
1505 1498
1506 if (m->buttons) 1499 if (m->buttons)
1507 free_objectlinkpt (m->buttons); 1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1508
1509 m->buttons = NULL;
1510 1501
1511 for (int i = 0; i < 4; i++) 1502 for (int i = 0; i < 4; i++)
1512 { 1503 free (m->tile_path[i]), m->tile_path[i] = 0;
1513 if (m->tile_path[i])
1514 FREE_AND_CLEAR (m->tile_path[i]);
1515
1516 m->tile_map[i] = 0;
1517 }
1518 1504
1519 m->in_memory = MAP_SWAPPED; 1505 m->in_memory = MAP_SWAPPED;
1520
1521#undef FREE_AND_CLEAR
1522} 1506}
1523 1507
1524maptile::~maptile () 1508maptile::~maptile ()
1525{ 1509{
1526 free_map (this, 1); 1510 assert (destroyed ());
1527 free (tmpname);
1528} 1511}
1529 1512
1530void 1513void
1531maptile::do_destroy () 1514maptile::do_destroy ()
1532{ 1515{
1533 attachable::do_destroy (); 1516 attachable::do_destroy ();
1534 1517
1535 free_all_objects (this); 1518 unlink ();
1519
1520 free_map (this, 1);
1521 free (tmpname), tmpname = 0;
1536 1522
1537 /* We need to look through all the maps and see if any maps 1523 /* We need to look through all the maps and see if any maps
1538 * are pointing at this one for tiling information. Since 1524 * are pointing at this one for tiling information. Since
1539 * tiling can be asymetric, we just can not look to see which 1525 * tiling can be asymetric, we just can not look to see which
1540 * maps this map tiles with and clears those. 1526 * maps this map tiles with and clears those.
1541 */ 1527 */
1542 //TODO: non-euclidean-tiling MUST GO 1528 //TODO: non-euclidean-tiling MUST GO
1543 for (maptile *m = first_map; m; m = m->next) 1529 for_all_maps (m)
1544 for (int i = 0; i < 4; i++) 1530 for (int i = 0; i < 4; i++)
1545 if (m->tile_map[i] == this) 1531 if (m->tile_map[i] == this)
1546 m->tile_map[i] = 0; 1532 m->tile_map[i] = 0;
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} 1533}
1558 1534
1559//TODO: must go 1535//TODO: must go
1560void 1536void
1561delete_map (maptile *m) 1537delete_map (maptile *m)
… …
1609 if (flags & MAP_PLAYER_UNIQUE) 1585 if (flags & MAP_PLAYER_UNIQUE)
1610 LOG (llevDebug, "Trying to load map %s.\n", name); 1586 LOG (llevDebug, "Trying to load map %s.\n", name);
1611 else 1587 else
1612 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); 1588 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1613 1589
1614 //eval_pv ("$x = Event::time", 1);//D
1615 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) 1590 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1616 return (NULL); 1591 return (NULL);
1617 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1618 1592
1619 fix_auto_apply (m); /* Chests which open as default */ 1593 fix_auto_apply (m); /* Chests which open as default */
1620 1594
1621 /* If a player unique map, no extra unique object file to load. 1595 /* If a player unique map, no extra unique object file to load.
1622 * if from the editor, likewise. 1596 * if from the editor, likewise.
… …
1692 int x, y, i; 1666 int x, y, i;
1693 long monster_cnt = 0; 1667 long monster_cnt = 0;
1694 double avgexp = 0; 1668 double avgexp = 0;
1695 sint64 total_exp = 0; 1669 sint64 total_exp = 0;
1696 1670
1697 if (MAP_DIFFICULTY (m)) 1671 if (m->difficulty)
1698 { 1672 {
1699 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1673 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1700 return MAP_DIFFICULTY (m); 1674 return m->difficulty;
1701 } 1675 }
1702 1676
1703 for (x = 0; x < MAP_WIDTH (m); x++) 1677 for (x = 0; x < m->width; x++)
1704 for (y = 0; y < MAP_HEIGHT (m); y++) 1678 for (y = 0; y < m->height; y++)
1705 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) 1679 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1706 { 1680 {
1707 if (QUERY_FLAG (op, FLAG_MONSTER)) 1681 if (QUERY_FLAG (op, FLAG_MONSTER))
1708 { 1682 {
1709 total_exp += op->stats.exp; 1683 total_exp += op->stats.exp;
… …
1758 if (first_map->in_memory == MAP_SAVING) 1732 if (first_map->in_memory == MAP_SAVING)
1759 first_map->in_memory = MAP_IN_MEMORY; 1733 first_map->in_memory = MAP_IN_MEMORY;
1760 delete_map (first_map); 1734 delete_map (first_map);
1761 real_maps++; 1735 real_maps++;
1762 } 1736 }
1737
1763 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1738 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1764} 1739}
1765 1740
1766/* change_map_light() - used to change map light level (darkness) 1741/* change_map_light() - used to change map light level (darkness)
1767 * up or down. Returns true if successful. It should now be 1742 * up or down. Returns true if successful. It should now be
… …
1826 1801
1827 middle_obj = 0; 1802 middle_obj = 0;
1828 top_obj = 0; 1803 top_obj = 0;
1829 floor_obj = 0; 1804 floor_obj = 0;
1830 1805
1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) 1806 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1832 { 1807 {
1833 /* This could be made additive I guess (two lights better than 1808 /* This could be made additive I guess (two lights better than
1834 * one). But if so, it shouldn't be a simple additive - 2 1809 * one). But if so, it shouldn't be a simple additive - 2
1835 * light bulbs do not illuminate twice as far as once since 1810 * light bulbs do not illuminate twice as far as once since
1836 * it is a dissapation factor that is cubed. 1811 * it is a dissapation factor that is cubed.
… …
1986void 1961void
1987set_map_reset_time (maptile *map) 1962set_map_reset_time (maptile *map)
1988{ 1963{
1989 int timeout; 1964 int timeout;
1990 1965
1991 timeout = MAP_RESET_TIMEOUT (map); 1966 timeout = map->reset_timeout;
1992 if (timeout <= 0) 1967 if (timeout <= 0)
1993 timeout = MAP_DEFAULTRESET; 1968 timeout = MAP_DEFAULTRESET;
1994 if (timeout >= MAP_MAXRESET) 1969 if (timeout >= MAP_MAXRESET)
1995 timeout = MAP_MAXRESET; 1970 timeout = MAP_MAXRESET;
1996 MAP_WHEN_RESET (map) = time (0) + timeout; 1971 map->reset_time = time (0) + timeout;
1997} 1972}
1998 1973
1999/* this updates the orig_map->tile_map[tile_num] value after loading 1974/* this updates the orig_map->tile_map[tile_num] value after loading
2000 * the map. It also takes care of linking back the freshly loaded 1975 * the map. It also takes care of linking back the freshly loaded
2001 * maps tile_map values if it tiles back to this one. It returns 1976 * maps tile_map values if it tiles back to this one. It returns
… …
2044 return 1; 2019 return 1;
2045 2020
2046 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2021 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2047 load_and_link_tiled_map (m, 3); 2022 load_and_link_tiled_map (m, 3);
2048 2023
2049 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2024 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2050 } 2025 }
2051 2026
2052 if (x >= MAP_WIDTH (m)) 2027 if (x >= m->width)
2053 { 2028 {
2054 if (!m->tile_path[1]) 2029 if (!m->tile_path[1])
2055 return 1; 2030 return 1;
2056 2031
2057 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2032 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2058 load_and_link_tiled_map (m, 1); 2033 load_and_link_tiled_map (m, 1);
2059 2034
2060 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2035 return (out_of_map (m->tile_map[1], x - m->width, y));
2061 } 2036 }
2062 2037
2063 if (y < 0) 2038 if (y < 0)
2064 { 2039 {
2065 if (!m->tile_path[0]) 2040 if (!m->tile_path[0])
2066 return 1; 2041 return 1;
2067 2042
2068 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2043 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2069 load_and_link_tiled_map (m, 0); 2044 load_and_link_tiled_map (m, 0);
2070 2045
2071 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2046 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2072 } 2047 }
2073 2048
2074 if (y >= MAP_HEIGHT (m)) 2049 if (y >= m->height)
2075 { 2050 {
2076 if (!m->tile_path[2]) 2051 if (!m->tile_path[2])
2077 return 1; 2052 return 1;
2078 2053
2079 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2054 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2080 load_and_link_tiled_map (m, 2); 2055 load_and_link_tiled_map (m, 2);
2081 2056
2082 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2057 return (out_of_map (m->tile_map[2], x, y - m->height));
2083 } 2058 }
2084 2059
2085 /* Simple case - coordinates are within this local 2060 /* Simple case - coordinates are within this local
2086 * map. 2061 * map.
2087 */ 2062 */
… …
2105 if (!m->tile_path[3]) 2080 if (!m->tile_path[3])
2106 return 0; 2081 return 0;
2107 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2082 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2108 load_and_link_tiled_map (m, 3); 2083 load_and_link_tiled_map (m, 3);
2109 2084
2110 *x += MAP_WIDTH (m->tile_map[3]); 2085 *x += m->tile_map[3]->width;
2111 return (get_map_from_coord (m->tile_map[3], x, y)); 2086 return (get_map_from_coord (m->tile_map[3], x, y));
2112 } 2087 }
2113 2088
2114 if (*x >= MAP_WIDTH (m)) 2089 if (*x >= m->width)
2115 { 2090 {
2116 if (!m->tile_path[1]) 2091 if (!m->tile_path[1])
2117 return 0; 2092 return 0;
2118 2093
2119 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2094 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2120 load_and_link_tiled_map (m, 1); 2095 load_and_link_tiled_map (m, 1);
2121 2096
2122 *x -= MAP_WIDTH (m); 2097 *x -= m->width;
2123 return (get_map_from_coord (m->tile_map[1], x, y)); 2098 return (get_map_from_coord (m->tile_map[1], x, y));
2124 } 2099 }
2125 2100
2126 if (*y < 0) 2101 if (*y < 0)
2127 { 2102 {
… …
2129 return 0; 2104 return 0;
2130 2105
2131 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2106 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2132 load_and_link_tiled_map (m, 0); 2107 load_and_link_tiled_map (m, 0);
2133 2108
2134 *y += MAP_HEIGHT (m->tile_map[0]); 2109 *y += m->tile_map[0]->height;
2135 return (get_map_from_coord (m->tile_map[0], x, y)); 2110 return (get_map_from_coord (m->tile_map[0], x, y));
2136 } 2111 }
2137 2112
2138 if (*y >= MAP_HEIGHT (m)) 2113 if (*y >= m->height)
2139 { 2114 {
2140 if (!m->tile_path[2]) 2115 if (!m->tile_path[2])
2141 return 0; 2116 return 0;
2142 2117
2143 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2118 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2144 load_and_link_tiled_map (m, 2); 2119 load_and_link_tiled_map (m, 2);
2145 2120
2146 *y -= MAP_HEIGHT (m); 2121 *y -= m->height;
2147 return (get_map_from_coord (m->tile_map[2], x, y)); 2122 return (get_map_from_coord (m->tile_map[2], x, y));
2148 } 2123 }
2149 2124
2150 /* Simple case - coordinates are within this local 2125 /* Simple case - coordinates are within this local
2151 * map. 2126 * map.
… …
2171 2146
2172 } 2147 }
2173 else if (map1->tile_map[0] == map2) 2148 else if (map1->tile_map[0] == map2)
2174 { /* up */ 2149 { /* up */
2175 *dx = 0; 2150 *dx = 0;
2176 *dy = -MAP_HEIGHT (map2); 2151 *dy = -map2->height;
2177 } 2152 }
2178 else if (map1->tile_map[1] == map2) 2153 else if (map1->tile_map[1] == map2)
2179 { /* right */ 2154 { /* right */
2180 *dx = MAP_WIDTH (map1); 2155 *dx = map1->width;
2181 *dy = 0; 2156 *dy = 0;
2182 } 2157 }
2183 else if (map1->tile_map[2] == map2) 2158 else if (map1->tile_map[2] == map2)
2184 { /* down */ 2159 { /* down */
2185 *dx = 0; 2160 *dx = 0;
2186 *dy = MAP_HEIGHT (map1); 2161 *dy = map1->height;
2187 } 2162 }
2188 else if (map1->tile_map[3] == map2) 2163 else if (map1->tile_map[3] == map2)
2189 { /* left */ 2164 { /* left */
2190 *dx = -MAP_WIDTH (map2); 2165 *dx = -map2->width;
2191 *dy = 0; 2166 *dy = 0;
2192 2167
2193 } 2168 }
2194 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2169 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2195 { /* up right */ 2170 { /* up right */
2196 *dx = MAP_WIDTH (map1->tile_map[0]); 2171 *dx = map1->tile_map[0]->width;
2197 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2172 *dy = -map1->tile_map[0]->height;
2198 } 2173 }
2199 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2174 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2200 { /* up left */ 2175 { /* up left */
2201 *dx = -MAP_WIDTH (map2); 2176 *dx = -map2->width;
2202 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2177 *dy = -map1->tile_map[0]->height;
2203 } 2178 }
2204 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2179 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2205 { /* right up */ 2180 { /* right up */
2206 *dx = MAP_WIDTH (map1); 2181 *dx = map1->width;
2207 *dy = -MAP_HEIGHT (map2); 2182 *dy = -map2->height;
2208 } 2183 }
2209 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2184 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2210 { /* right down */ 2185 { /* right down */
2211 *dx = MAP_WIDTH (map1); 2186 *dx = map1->width;
2212 *dy = MAP_HEIGHT (map1->tile_map[1]); 2187 *dy = map1->tile_map[1]->height;
2213 } 2188 }
2214 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2189 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2215 { /* down right */ 2190 { /* down right */
2216 *dx = MAP_WIDTH (map1->tile_map[2]); 2191 *dx = map1->tile_map[2]->width;
2217 *dy = MAP_HEIGHT (map1); 2192 *dy = map1->height;
2218 } 2193 }
2219 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2194 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2220 { /* down left */ 2195 { /* down left */
2221 *dx = -MAP_WIDTH (map2); 2196 *dx = -map2->width;
2222 *dy = MAP_HEIGHT (map1); 2197 *dy = map1->height;
2223 } 2198 }
2224 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2199 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2225 { /* left up */ 2200 { /* left up */
2226 *dx = -MAP_WIDTH (map1->tile_map[3]); 2201 *dx = -map1->tile_map[3]->width;
2227 *dy = -MAP_HEIGHT (map2); 2202 *dy = -map2->height;
2228 } 2203 }
2229 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2204 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2230 { /* left down */ 2205 { /* left down */
2231 *dx = -MAP_WIDTH (map1->tile_map[3]); 2206 *dx = -map1->tile_map[3]->width;
2232 *dy = MAP_HEIGHT (map1->tile_map[3]); 2207 *dy = map1->tile_map[3]->height;
2233 2208
2234 } 2209 }
2235 else 2210 else
2236 { /* not "adjacent" enough */ 2211 { /* not "adjacent" enough */
2237 return 0; 2212 return 0;
… …
2362{ 2337{
2363 int dx, dy; 2338 int dx, dy;
2364 2339
2365 return adjacent_map (op1->map, op2->map, &dx, &dy); 2340 return adjacent_map (op1->map, op2->map, &dx, &dy);
2366} 2341}
2342
2343object *
2344maptile::insert (object *op, int x, int y, object *originator, int flags)
2345{
2346 if (!op->flag [FLAG_REMOVED])
2347 op->remove ();
2348
2349 return insert_ob_in_map_at (op, this, originator, flags, x, y);
2350}
2351

Diff Legend

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