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.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)
… …
409 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 405 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
410 if (flag & P_OUT_OF_MAP) 406 if (flag & P_OUT_OF_MAP)
411 return P_OUT_OF_MAP; 407 return P_OUT_OF_MAP;
412 408
413 /* don't have object, so don't know what types would block */ 409 /* don't have object, so don't know what types would block */
414 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 410 return m1->at (sx, sy).move_block;
415 } 411 }
416 412
417 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 413 for (tmp = ob->arch; tmp; tmp = tmp->more)
418 { 414 {
419 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 415 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
420 416
421 if (flag & P_OUT_OF_MAP) 417 if (flag & P_OUT_OF_MAP)
422 return P_OUT_OF_MAP; 418 return P_OUT_OF_MAP;
423 if (flag & P_IS_ALIVE) 419 if (flag & P_IS_ALIVE)
424 return P_IS_ALIVE; 420 return P_IS_ALIVE;
425 421
422 mapspace &ms = m1->at (sx, sy);
423
424
426 /* find_first_free_spot() calls this function. However, often 425 /* find_first_free_spot() calls this function. However, often
427 * ob doesn't have any move type (when used to place exits) 426 * 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. 427 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
429 */ 428 */
430 429
431 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 430 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
432 continue; 431 continue;
433 432
434 /* Note it is intentional that we check ob - the movement type of the 433 /* Note it is intentional that we check ob - the movement type of the
435 * head of the object should correspond for the entire object. 434 * head of the object should correspond for the entire object.
436 */ 435 */
437 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 436 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
438 return P_NO_PASS; 437 return P_NO_PASS;
439 } 438 }
440 439
441 return 0; 440 return 0;
442} 441}
… …
472 * 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
473 * 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
474 * 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
475 * the more sections and not re-add sections for them. 474 * the more sections and not re-add sections for them.
476 */ 475 */
477
478static void 476static void
479link_multipart_objects (maptile *m) 477link_multipart_objects (maptile *m)
480{ 478{
481 int x, y; 479 int x, y;
482 object *tmp, *op, *last, *above; 480 object *tmp, *op, *last, *above;
483 archetype *at; 481 archetype *at;
484 482
485 for (x = 0; x < MAP_WIDTH (m); x++) 483 for (x = 0; x < m->width; x++)
486 for (y = 0; y < MAP_HEIGHT (m); y++) 484 for (y = 0; y < m->height; y++)
487 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)
488 { 486 {
489 above = tmp->above; 487 above = tmp->above;
490 488
491 /* already multipart - don't do anything more */ 489 /* already multipart - don't do anything more */
… …
542 { 540 {
543 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 541 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
544 continue; 542 continue;
545 } 543 }
546 544
547
548 switch (i) 545 switch (i)
549 { 546 {
550 case LL_NORMAL: 547 case LL_NORMAL:
551 /* if we are loading an overlay, put the floors on the bottom */ 548 /* 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) 549 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, 595 * 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 596 * and we only save the head of multi part objects - this is needed
600 * in order to do map tiling properly. 597 * in order to do map tiling properly.
601 */ 598 */
602void 599void
603save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 600save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
604{ 601{
605 int i, j = 0, unique = 0; 602 int i, j = 0, unique = 0;
606 object *op; 603 object *op;
607 604
608 /* first pass - save one-part objects */ 605 /* first pass - save one-part objects */
609 for (i = 0; i < MAP_WIDTH (m); i++) 606 for (i = 0; i < m->width; i++)
610 for (j = 0; j < MAP_HEIGHT (m); j++) 607 for (j = 0; j < m->height; j++)
611 { 608 {
612 unique = 0; 609 unique = 0;
610
613 for (op = GET_MAP_OB (m, i, j); op; op = op->above) 611 for (op = m->at (i, j).bot; op; op = op->above)
614 { 612 {
615 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 613 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
616 unique = 1; 614 unique = 1;
617 615
618 if (op->type == PLAYER) 616 if (!op->can_map_save ())
619 continue; 617 continue;
620 618
621 if (op->head || op->owner)
622 continue;
623
624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 619 if (unique || op->flag [FLAG_UNIQUE])
625 save_object (fp2, op, 3); 620 save_object (fp2, op, 1);
626 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])))
627 save_object (fp, op, 3); 622 save_object (fp, op, 1);
628 } 623 }
629 } 624 }
630} 625}
631 626
632maptile::maptile () 627maptile::maptile ()
633{ 628{
634 in_memory = MAP_SWAPPED; 629 in_memory = MAP_SWAPPED;
630
635 /* 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
636 * map archetype. Mimic that behaviour. 632 * map archetype. Mimic that behaviour.
637 */ 633 */
638 MAP_WIDTH (this) = 16; 634 width = 16;
639 MAP_HEIGHT (this) = 16; 635 height = 16;
640 MAP_RESET_TIMEOUT (this) = 0; 636 reset_timeout = 0;
641 MAP_TIMEOUT (this) = 300; 637 timeout = 300;
642 MAP_ENTER_X (this) = 0; 638 enter_x = 0;
643 MAP_ENTER_Y (this) = 0; 639 enter_y = 0;
644 /*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 */
645 MAP_WORLDPARTX (this) = -1; 641 worldpartx = -1;
646 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 }
647} 664}
648 665
649/* 666/*
650 * Allocates, initialises, and returns a pointer to a maptile. 667 * Allocates, initialises, and returns a pointer to a maptile.
651 * 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
652 * used anyways. MSW 2001-07-01 669 * used anyways. MSW 2001-07-01
653 */ 670 */
654maptile * 671maptile *
655get_linked_map (void) 672get_linked_map (void)
656{ 673{
657 maptile *mp, *map = new maptile; 674 maptile *map = new maptile;
658 675 map->link ();
659 for (mp = first_map; mp && mp->next; mp = mp->next);
660
661 if (mp == NULL)
662 first_map = map;
663 else
664 mp->next = map;
665
666 return map; 676 return map;
667} 677}
668 678
669/* 679/*
670 * Allocates the arrays contained in a maptile. 680 * Allocates the arrays contained in a maptile.
… …
681 * that is their poor assumption. 691 * that is their poor assumption.
682 */ 692 */
683 if (spaces) 693 if (spaces)
684 { 694 {
685 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);
686 free (spaces); 696 sfree (spaces, size ());
687 } 697 }
688 698
689 spaces = (mapspace *) 699 spaces = salloc0<mapspace> (size ());
690 calloc (1, width * height * sizeof (mapspace));
691
692 if (!spaces)
693 fatal (OUT_OF_MEMORY);
694} 700}
695 701
696/* Create and returns a map of the specific size. Used 702/* Create and returns a map of the specific size. Used
697 * in random map code and the editor. 703 * in random map code and the editor.
698 */ 704 */
… …
731 p = strchr (p, ';'); 737 p = strchr (p, ';');
732 number_of_entries++; 738 number_of_entries++;
733 if (p) 739 if (p)
734 p++; 740 p++;
735 } 741 }
742
736 p = shop_string; 743 p = shop_string;
737 strip_endline (p); 744 strip_endline (p);
738 items = new shopitems[number_of_entries + 1]; 745 items = new shopitems[number_of_entries + 1];
739 for (i = 0; i < number_of_entries; i++) 746 for (i = 0; i < number_of_entries; i++)
740 { 747 {
741 if (!p) 748 if (!p)
742 { 749 {
743 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");
744 break; 751 break;
745 } 752 }
753
746 next_semicolon = strchr (p, ';'); 754 next_semicolon = strchr (p, ';');
747 next_colon = strchr (p, ':'); 755 next_colon = strchr (p, ':');
748 /* 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. */
749 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 757 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
750 items[i].strength = atoi (strchr (p, ':') + 1); 758 items[i].strength = atoi (strchr (p, ':') + 1);
… …
777 * 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
778 */ 786 */
779 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);
780 } 788 }
781 } 789 }
790
782 items[i].index = number_of_entries; 791 items[i].index = number_of_entries;
783 if (next_semicolon) 792 if (next_semicolon)
784 p = ++next_semicolon; 793 p = ++next_semicolon;
785 else 794 else
786 p = NULL; 795 p = NULL;
787 } 796 }
797
788 free (shop_string); 798 free (shop_string);
789 return items; 799 return items;
790} 800}
791 801
792/* 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
… …
801 for (i = 0; i < m->shopitems[0].index; i++) 811 for (i = 0; i < m->shopitems[0].index; i++)
802 { 812 {
803 if (m->shopitems[i].typenum) 813 if (m->shopitems[i].typenum)
804 { 814 {
805 if (m->shopitems[i].strength) 815 if (m->shopitems[i].strength)
806 {
807 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);
808 }
809 else 817 else
810 sprintf (tmp, "%s;", m->shopitems[i].name); 818 sprintf (tmp, "%s;", m->shopitems[i].name);
811 } 819 }
812 else 820 else
813 { 821 {
814 if (m->shopitems[i].strength) 822 if (m->shopitems[i].strength)
815 {
816 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 823 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
817 }
818 else 824 else
819 sprintf (tmp, "*"); 825 sprintf (tmp, "*");
820 } 826 }
827
821 strcat (output_string, tmp); 828 strcat (output_string, tmp);
822 } 829 }
823} 830}
824 831
825/* This loads the header information of the map. The header 832/* This loads the header information of the map. The header
… …
1093 * 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
1094 * cases, no matter if this flag is set or not. 1101 * cases, no matter if this flag is set or not.
1095 * 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
1096 * managed map list. 1103 * managed map list.
1097 */ 1104 */
1098
1099maptile * 1105maptile *
1100load_original_map (const char *filename, int flags) 1106load_original_map (const char *filename, int flags)
1101{ 1107{
1102 maptile *m; 1108 maptile *m;
1103 char pathname[MAX_BUF]; 1109 char pathname[MAX_BUF];
… …
1121 strcpy (m->path, filename); 1127 strcpy (m->path, filename);
1122 if (load_map_header (thawer, m)) 1128 if (load_map_header (thawer, m))
1123 { 1129 {
1124 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1130 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1125 delete_map (m); 1131 delete_map (m);
1126 return NULL; 1132 return 0;
1127 } 1133 }
1128 1134
1129 m->allocate (); 1135 m->allocate ();
1130 1136
1131 m->in_memory = MAP_LOADING; 1137 m->in_memory = MAP_LOADING;
1132 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1138 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1133 1139
1134 m->in_memory = MAP_IN_MEMORY; 1140 m->in_memory = MAP_IN_MEMORY;
1135 if (!MAP_DIFFICULTY (m)) 1141 if (!m->difficulty)
1136 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1142 m->difficulty = calculate_difficulty (m);
1137 set_map_reset_time (m); 1143 set_map_reset_time (m);
1138 m->instantiate (); 1144 m->instantiate ();
1139 return (m); 1145 return (m);
1140} 1146}
1141 1147
1142/* 1148/*
1143 * Loads a map, which has been loaded earlier, from file. 1149 * Loads a map, which has been loaded earlier, from file.
1144 * 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
1145 * option if we can't find the original map) 1151 * option if we can't find the original map)
1146 */ 1152 */
1147
1148static maptile * 1153static maptile *
1149load_temporary_map (maptile *m) 1154load_temporary_map (maptile *m)
1150{ 1155{
1151 char buf[MAX_BUF]; 1156 char buf[MAX_BUF];
1152 1157
… …
1196/* 1201/*
1197 * Loads a map, which has been loaded earlier, from file. 1202 * Loads a map, which has been loaded earlier, from file.
1198 * 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
1199 * option if we can't find the original map) 1204 * option if we can't find the original map)
1200 */ 1205 */
1201
1202maptile * 1206maptile *
1203load_overlay_map (const char *filename, maptile *m) 1207load_overlay_map (const char *filename, maptile *m)
1204{ 1208{
1205 char pathname[MAX_BUF]; 1209 char pathname[MAX_BUF];
1206 1210
… …
1214 if (load_map_header (thawer, m)) 1218 if (load_map_header (thawer, m))
1215 { 1219 {
1216 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1220 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1217 delete_map (m); 1221 delete_map (m);
1218 m = load_original_map (m->path, 0); 1222 m = load_original_map (m->path, 0);
1219 return NULL; 1223 return 0;
1220 } 1224 }
1221 /*m->allocate ();*/ 1225 /*m->allocate ();*/
1222 1226
1223 m->in_memory = MAP_LOADING; 1227 m->in_memory = MAP_LOADING;
1224 load_objects (m, thawer, MAP_OVERLAY); 1228 load_objects (m, thawer, MAP_OVERLAY);
… …
1236delete_unique_items (maptile *m) 1240delete_unique_items (maptile *m)
1237{ 1241{
1238 int i, j, unique; 1242 int i, j, unique;
1239 object *op, *next; 1243 object *op, *next;
1240 1244
1241 for (i = 0; i < MAP_WIDTH (m); i++) 1245 for (i = 0; i < m->width; i++)
1242 for (j = 0; j < MAP_HEIGHT (m); j++) 1246 for (j = 0; j < m->height; j++)
1243 { 1247 {
1244 unique = 0; 1248 unique = 0;
1245 1249
1246 for (op = GET_MAP_OB (m, i, j); op; op = next) 1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1247 { 1251 {
… …
1250 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1254 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1251 unique = 1; 1255 unique = 1;
1252 1256
1253 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1257 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1254 { 1258 {
1255 clean_object (op); 1259 op->destroy_inv (false);
1256
1257 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1258 remove_button_link (op);
1259
1260 op->destroy (); 1260 op->destroy ();
1261 } 1261 }
1262 } 1262 }
1263 } 1263 }
1264} 1264}
1265 1265
1266
1267/* 1266/*
1268 * 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
1269 * m is the map to load unique items into. 1268 * m is the map to load unique items into.
1270 */ 1269 */
1271static void 1270static void
… …
1290 return; 1289 return;
1291 1290
1292 m->in_memory = MAP_LOADING; 1291 m->in_memory = MAP_LOADING;
1293 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1294 delete_unique_items (m); /* original map before, don't duplicate them */ 1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1295 load_objects (m, thawer, 0); 1295 load_objects (m, thawer, 0);
1296 1296
1297 m->in_memory = MAP_IN_MEMORY; 1297 m->in_memory = MAP_IN_MEMORY;
1298} 1298}
1299
1300 1299
1301/* 1300/*
1302 * Saves a map to file. If flag is set, it is saved into the same 1301 * Saves a map to file. If flag is set, it is saved into the same
1303 * file it was (originally) loaded from. Otherwise a temporary 1302 * file it was (originally) loaded from. Otherwise a temporary
1304 * filename will be genarated, and the file will be stored there. 1303 * filename will be genarated, and the file will be stored there.
1305 * The temporary filename will be stored in the maptileure. 1304 * The temporary filename will be stored in the maptileure.
1306 * If the map is unique, we also save to the filename in the map 1305 * If the map is unique, we also save to the filename in the map
1307 * (this should have been updated when first loaded) 1306 * (this should have been updated when first loaded)
1308 */ 1307 */
1309
1310int 1308int
1311new_save_map (maptile *m, int flag) 1309new_save_map (maptile *m, int flag)
1312{ 1310{
1313 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1314 int i; 1312 int i;
… …
1446 freezer.save (filename); 1444 freezer.save (filename);
1447 1445
1448 return 0; 1446 return 0;
1449} 1447}
1450 1448
1451
1452/*
1453 * Remove and free all objects in the inventory of the given object.
1454 * object.c ?
1455 */
1456
1457void
1458clean_object (object *op)
1459{
1460 object *tmp, *next;
1461
1462 for (tmp = op->inv; tmp; tmp = next)
1463 {
1464 next = tmp->below;
1465
1466 clean_object (tmp);
1467 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1468 remove_button_link (tmp);
1469
1470 tmp->destroy ();
1471 }
1472}
1473
1474/* 1449/*
1475 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1476 */ 1451 */
1477
1478void 1452void
1479free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1480{ 1454{
1481 int i, j; 1455 if (!m->spaces)
1482 object *op; 1456 return;
1483 1457
1484 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1485 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1486 { 1460 {
1487 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1488 1462
1489 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bot)
1490 { 1464 {
1491 if (op == previous_obj)
1492 {
1493 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1494 break;
1495 }
1496
1497 previous_obj = op;
1498
1499 if (op->head != NULL) 1465 if (op->head)
1500 op = op->head; 1466 op = op->head;
1501 1467
1502 /* If the map isn't in memory, free_object will remove and 1468 op->destroy_inv (false);
1503 * free objects in op's inventory. So let it do the job.
1504 */
1505 if (m->in_memory == MAP_IN_MEMORY)
1506 clean_object (op);
1507
1508 op->destroy (); 1469 op->destroy ();
1509 } 1470 }
1510 } 1471 }
1511} 1472}
1512 1473
1513/* 1474/*
1514 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1515 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1516 */ 1477 */
1517
1518void 1478void
1519free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1520{ 1480{
1521 int i; 1481 if (!m->in_memory) //TODO: makes no sense to me?
1522
1523 if (!m->in_memory)
1524 {
1525 LOG (llevError, "Trying to free freed map.\n");
1526 return; 1482 return;
1527 } 1483
1484 m->in_memory = MAP_SAVING;
1528 1485
1529 // TODO: use new/delete 1486 // TODO: use new/delete
1530#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531 1487
1532 if (flag && m->spaces) 1488 if (flag && m->spaces)
1533 free_all_objects (m); 1489 free_all_objects (m);
1534 if (m->name)
1535 FREE_AND_CLEAR (m->name);
1536 if (m->spaces)
1537 FREE_AND_CLEAR (m->spaces);
1538 if (m->msg)
1539 FREE_AND_CLEAR (m->msg);
1540 if (m->maplore)
1541 FREE_AND_CLEAR (m->maplore);
1542 1490
1543 delete [] m->shopitems; 1491 sfree (m->spaces, m->size ()), m->spaces = 0;
1544 m->shopitems = 0;
1545 1492
1546 if (m->shoprace) 1493 free (m->name), m->name = 0;
1547 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;
1548 1498
1549 if (m->buttons) 1499 if (m->buttons)
1550 free_objectlinkpt (m->buttons); 1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1551 1501
1552 m->buttons = NULL;
1553
1554 for (i = 0; i < 4; i++) 1502 for (int i = 0; i < 4; i++)
1555 { 1503 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 1504
1561 m->in_memory = MAP_SWAPPED; 1505 m->in_memory = MAP_SWAPPED;
1562
1563#undef FREE_AND_CLEAR
1564
1565} 1506}
1566 1507
1567/* 1508maptile::~maptile ()
1568 * function: vanish maptile 1509{
1569 * m : pointer to maptile, if NULL no action 1510 assert (destroyed ());
1570 * this deletes all the data on the map (freeing pointers) 1511}
1571 * and then removes this map from the global linked list of maps. 1512
1513void
1514maptile::do_destroy ()
1515{
1516 attachable::do_destroy ();
1517
1518 unlink ();
1519
1520 free_map (this, 1);
1521 free (tmpname), tmpname = 0;
1522
1523 /* We need to look through all the maps and see if any maps
1524 * are pointing at this one for tiling information. Since
1525 * tiling can be asymetric, we just can not look to see which
1526 * maps this map tiles with and clears those.
1572 */ 1527 */
1528 //TODO: non-euclidean-tiling MUST GO
1529 for_all_maps (m)
1530 for (int i = 0; i < 4; i++)
1531 if (m->tile_map[i] == this)
1532 m->tile_map[i] = 0;
1533}
1573 1534
1535//TODO: must go
1574void 1536void
1575delete_map (maptile *m) 1537delete_map (maptile *m)
1576{ 1538{
1577 maptile *tmp, *last;
1578 int i;
1579
1580 if (!m) 1539 if (m)
1581 return; 1540 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} 1541}
1634 1542
1635/* 1543/*
1636 * Makes sure the given map is loaded and swapped in. 1544 * Makes sure the given map is loaded and swapped in.
1637 * name is path name of the map. 1545 * name is path name of the map.
… …
1644 * Returns a pointer to the given map. 1552 * Returns a pointer to the given map.
1645 */ 1553 */
1646maptile * 1554maptile *
1647ready_map_name (const char *name, int flags) 1555ready_map_name (const char *name, int flags)
1648{ 1556{
1649 maptile *m;
1650
1651 if (!name) 1557 if (!name)
1652 return (NULL); 1558 return 0;
1653 1559
1654 /* Have we been at this level before? */ 1560 /* Have we been at this level before? */
1655 m = has_been_loaded (name); 1561 maptile *m = has_been_loaded (name);
1656 1562
1657 /* Map is good to go, so just return it */ 1563 /* Map is good to go, so just return it */
1658 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1564 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1659 {
1660 return m; 1565 return m;
1661 }
1662 1566
1663 /* unique maps always get loaded from their original location, and never 1567 /* 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 1568 * 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 - 1569 * 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 1570 * 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 1572 * 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. 1573 * resets in any case - if they really care, they should use the 'maps command.
1670 */ 1574 */
1671 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1575 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1672 { 1576 {
1673
1674 /* first visit or time to reset */ 1577 /* first visit or time to reset */
1675 if (m) 1578 if (m)
1676 { 1579 {
1677 clean_tmp_map (m); /* Doesn't make much difference */ 1580 clean_tmp_map (m); /* Doesn't make much difference */
1678 delete_map (m); 1581 delete_map (m);
… …
1682 if (flags & MAP_PLAYER_UNIQUE) 1585 if (flags & MAP_PLAYER_UNIQUE)
1683 LOG (llevDebug, "Trying to load map %s.\n", name); 1586 LOG (llevDebug, "Trying to load map %s.\n", name);
1684 else 1587 else
1685 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); 1588 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1686 1589
1687 //eval_pv ("$x = Event::time", 1);//D
1688 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) 1590 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1689 return (NULL); 1591 return (NULL);
1690 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1691 1592
1692 fix_auto_apply (m); /* Chests which open as default */ 1593 fix_auto_apply (m); /* Chests which open as default */
1693 1594
1694 /* 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.
1695 * if from the editor, likewise. 1596 * if from the editor, likewise.
… …
1765 int x, y, i; 1666 int x, y, i;
1766 long monster_cnt = 0; 1667 long monster_cnt = 0;
1767 double avgexp = 0; 1668 double avgexp = 0;
1768 sint64 total_exp = 0; 1669 sint64 total_exp = 0;
1769 1670
1770 if (MAP_DIFFICULTY (m)) 1671 if (m->difficulty)
1771 { 1672 {
1772 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1673 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1773 return MAP_DIFFICULTY (m); 1674 return m->difficulty;
1774 } 1675 }
1775 1676
1776 for (x = 0; x < MAP_WIDTH (m); x++) 1677 for (x = 0; x < m->width; x++)
1777 for (y = 0; y < MAP_HEIGHT (m); y++) 1678 for (y = 0; y < m->height; y++)
1778 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)
1779 { 1680 {
1780 if (QUERY_FLAG (op, FLAG_MONSTER)) 1681 if (QUERY_FLAG (op, FLAG_MONSTER))
1781 { 1682 {
1782 total_exp += op->stats.exp; 1683 total_exp += op->stats.exp;
… …
1831 if (first_map->in_memory == MAP_SAVING) 1732 if (first_map->in_memory == MAP_SAVING)
1832 first_map->in_memory = MAP_IN_MEMORY; 1733 first_map->in_memory = MAP_IN_MEMORY;
1833 delete_map (first_map); 1734 delete_map (first_map);
1834 real_maps++; 1735 real_maps++;
1835 } 1736 }
1737
1836 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1738 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1837} 1739}
1838 1740
1839/* change_map_light() - used to change map light level (darkness) 1741/* change_map_light() - used to change map light level (darkness)
1840 * up or down. Returns true if successful. It should now be 1742 * up or down. Returns true if successful. It should now be
… …
1899 1801
1900 middle_obj = 0; 1802 middle_obj = 0;
1901 top_obj = 0; 1803 top_obj = 0;
1902 floor_obj = 0; 1804 floor_obj = 0;
1903 1805
1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) 1806 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1905 { 1807 {
1906 /* This could be made additive I guess (two lights better than 1808 /* This could be made additive I guess (two lights better than
1907 * 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
1908 * light bulbs do not illuminate twice as far as once since 1810 * light bulbs do not illuminate twice as far as once since
1909 * it is a dissapation factor that is cubed. 1811 * it is a dissapation factor that is cubed.
… …
2059void 1961void
2060set_map_reset_time (maptile *map) 1962set_map_reset_time (maptile *map)
2061{ 1963{
2062 int timeout; 1964 int timeout;
2063 1965
2064 timeout = MAP_RESET_TIMEOUT (map); 1966 timeout = map->reset_timeout;
2065 if (timeout <= 0) 1967 if (timeout <= 0)
2066 timeout = MAP_DEFAULTRESET; 1968 timeout = MAP_DEFAULTRESET;
2067 if (timeout >= MAP_MAXRESET) 1969 if (timeout >= MAP_MAXRESET)
2068 timeout = MAP_MAXRESET; 1970 timeout = MAP_MAXRESET;
2069 MAP_WHEN_RESET (map) = time (0) + timeout; 1971 map->reset_time = time (0) + timeout;
2070} 1972}
2071 1973
2072/* 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
2073 * 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
2074 * 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
… …
2117 return 1; 2019 return 1;
2118 2020
2119 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)
2120 load_and_link_tiled_map (m, 3); 2022 load_and_link_tiled_map (m, 3);
2121 2023
2122 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));
2123 } 2025 }
2124 2026
2125 if (x >= MAP_WIDTH (m)) 2027 if (x >= m->width)
2126 { 2028 {
2127 if (!m->tile_path[1]) 2029 if (!m->tile_path[1])
2128 return 1; 2030 return 1;
2129 2031
2130 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)
2131 load_and_link_tiled_map (m, 1); 2033 load_and_link_tiled_map (m, 1);
2132 2034
2133 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));
2134 } 2036 }
2135 2037
2136 if (y < 0) 2038 if (y < 0)
2137 { 2039 {
2138 if (!m->tile_path[0]) 2040 if (!m->tile_path[0])
2139 return 1; 2041 return 1;
2140 2042
2141 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)
2142 load_and_link_tiled_map (m, 0); 2044 load_and_link_tiled_map (m, 0);
2143 2045
2144 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));
2145 } 2047 }
2146 2048
2147 if (y >= MAP_HEIGHT (m)) 2049 if (y >= m->height)
2148 { 2050 {
2149 if (!m->tile_path[2]) 2051 if (!m->tile_path[2])
2150 return 1; 2052 return 1;
2151 2053
2152 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)
2153 load_and_link_tiled_map (m, 2); 2055 load_and_link_tiled_map (m, 2);
2154 2056
2155 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));
2156 } 2058 }
2157 2059
2158 /* Simple case - coordinates are within this local 2060 /* Simple case - coordinates are within this local
2159 * map. 2061 * map.
2160 */ 2062 */
… …
2178 if (!m->tile_path[3]) 2080 if (!m->tile_path[3])
2179 return 0; 2081 return 0;
2180 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)
2181 load_and_link_tiled_map (m, 3); 2083 load_and_link_tiled_map (m, 3);
2182 2084
2183 *x += MAP_WIDTH (m->tile_map[3]); 2085 *x += m->tile_map[3]->width;
2184 return (get_map_from_coord (m->tile_map[3], x, y)); 2086 return (get_map_from_coord (m->tile_map[3], x, y));
2185 } 2087 }
2186 2088
2187 if (*x >= MAP_WIDTH (m)) 2089 if (*x >= m->width)
2188 { 2090 {
2189 if (!m->tile_path[1]) 2091 if (!m->tile_path[1])
2190 return 0; 2092 return 0;
2191 2093
2192 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)
2193 load_and_link_tiled_map (m, 1); 2095 load_and_link_tiled_map (m, 1);
2194 2096
2195 *x -= MAP_WIDTH (m); 2097 *x -= m->width;
2196 return (get_map_from_coord (m->tile_map[1], x, y)); 2098 return (get_map_from_coord (m->tile_map[1], x, y));
2197 } 2099 }
2198 2100
2199 if (*y < 0) 2101 if (*y < 0)
2200 { 2102 {
… …
2202 return 0; 2104 return 0;
2203 2105
2204 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)
2205 load_and_link_tiled_map (m, 0); 2107 load_and_link_tiled_map (m, 0);
2206 2108
2207 *y += MAP_HEIGHT (m->tile_map[0]); 2109 *y += m->tile_map[0]->height;
2208 return (get_map_from_coord (m->tile_map[0], x, y)); 2110 return (get_map_from_coord (m->tile_map[0], x, y));
2209 } 2111 }
2210 2112
2211 if (*y >= MAP_HEIGHT (m)) 2113 if (*y >= m->height)
2212 { 2114 {
2213 if (!m->tile_path[2]) 2115 if (!m->tile_path[2])
2214 return 0; 2116 return 0;
2215 2117
2216 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)
2217 load_and_link_tiled_map (m, 2); 2119 load_and_link_tiled_map (m, 2);
2218 2120
2219 *y -= MAP_HEIGHT (m); 2121 *y -= m->height;
2220 return (get_map_from_coord (m->tile_map[2], x, y)); 2122 return (get_map_from_coord (m->tile_map[2], x, y));
2221 } 2123 }
2222 2124
2223 /* Simple case - coordinates are within this local 2125 /* Simple case - coordinates are within this local
2224 * map. 2126 * map.
… …
2244 2146
2245 } 2147 }
2246 else if (map1->tile_map[0] == map2) 2148 else if (map1->tile_map[0] == map2)
2247 { /* up */ 2149 { /* up */
2248 *dx = 0; 2150 *dx = 0;
2249 *dy = -MAP_HEIGHT (map2); 2151 *dy = -map2->height;
2250 } 2152 }
2251 else if (map1->tile_map[1] == map2) 2153 else if (map1->tile_map[1] == map2)
2252 { /* right */ 2154 { /* right */
2253 *dx = MAP_WIDTH (map1); 2155 *dx = map1->width;
2254 *dy = 0; 2156 *dy = 0;
2255 } 2157 }
2256 else if (map1->tile_map[2] == map2) 2158 else if (map1->tile_map[2] == map2)
2257 { /* down */ 2159 { /* down */
2258 *dx = 0; 2160 *dx = 0;
2259 *dy = MAP_HEIGHT (map1); 2161 *dy = map1->height;
2260 } 2162 }
2261 else if (map1->tile_map[3] == map2) 2163 else if (map1->tile_map[3] == map2)
2262 { /* left */ 2164 { /* left */
2263 *dx = -MAP_WIDTH (map2); 2165 *dx = -map2->width;
2264 *dy = 0; 2166 *dy = 0;
2265 2167
2266 } 2168 }
2267 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)
2268 { /* up right */ 2170 { /* up right */
2269 *dx = MAP_WIDTH (map1->tile_map[0]); 2171 *dx = map1->tile_map[0]->width;
2270 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2172 *dy = -map1->tile_map[0]->height;
2271 } 2173 }
2272 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)
2273 { /* up left */ 2175 { /* up left */
2274 *dx = -MAP_WIDTH (map2); 2176 *dx = -map2->width;
2275 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2177 *dy = -map1->tile_map[0]->height;
2276 } 2178 }
2277 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)
2278 { /* right up */ 2180 { /* right up */
2279 *dx = MAP_WIDTH (map1); 2181 *dx = map1->width;
2280 *dy = -MAP_HEIGHT (map2); 2182 *dy = -map2->height;
2281 } 2183 }
2282 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)
2283 { /* right down */ 2185 { /* right down */
2284 *dx = MAP_WIDTH (map1); 2186 *dx = map1->width;
2285 *dy = MAP_HEIGHT (map1->tile_map[1]); 2187 *dy = map1->tile_map[1]->height;
2286 } 2188 }
2287 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)
2288 { /* down right */ 2190 { /* down right */
2289 *dx = MAP_WIDTH (map1->tile_map[2]); 2191 *dx = map1->tile_map[2]->width;
2290 *dy = MAP_HEIGHT (map1); 2192 *dy = map1->height;
2291 } 2193 }
2292 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)
2293 { /* down left */ 2195 { /* down left */
2294 *dx = -MAP_WIDTH (map2); 2196 *dx = -map2->width;
2295 *dy = MAP_HEIGHT (map1); 2197 *dy = map1->height;
2296 } 2198 }
2297 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)
2298 { /* left up */ 2200 { /* left up */
2299 *dx = -MAP_WIDTH (map1->tile_map[3]); 2201 *dx = -map1->tile_map[3]->width;
2300 *dy = -MAP_HEIGHT (map2); 2202 *dy = -map2->height;
2301 } 2203 }
2302 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)
2303 { /* left down */ 2205 { /* left down */
2304 *dx = -MAP_WIDTH (map1->tile_map[3]); 2206 *dx = -map1->tile_map[3]->width;
2305 *dy = MAP_HEIGHT (map1->tile_map[3]); 2207 *dy = map1->tile_map[3]->height;
2306 2208
2307 } 2209 }
2308 else 2210 else
2309 { /* not "adjacent" enough */ 2211 { /* not "adjacent" enough */
2310 return 0; 2212 return 0;
… …
2435{ 2337{
2436 int dx, dy; 2338 int dx, dy;
2437 2339
2438 return adjacent_map (op1->map, op2->map, &dx, &dy); 2340 return adjacent_map (op1->map, op2->map, &dx, &dy);
2439} 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