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.44 by root, Mon Dec 18 04:07:30 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 != NULL; m = m->next)
228 {
229 dump_map (m); 224 dump_map (m);
230 }
231} 225}
232 226
233/* This rolls up wall, blocks_magic, blocks_view, etc, all into 227/* This rolls up wall, blocks_magic, blocks_view, etc, all into
234 * one function that just returns a P_.. value (see map.h) 228 * one function that just returns a P_.. value (see map.h)
235 * it will also do map translation for tiled maps, returning 229 * it will also do map translation for tiled maps, returning
… …
239 * is needed. The case of not passing values is if we're just 233 * is needed. The case of not passing values is if we're just
240 * checking for the existence of something on those spaces, but 234 * checking for the existence of something on those spaces, but
241 * don't expect to insert/remove anything from those spaces. 235 * don't expect to insert/remove anything from those spaces.
242 */ 236 */
243int 237int
244get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 238get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
245{ 239{
246 sint16 newx, newy; 240 sint16 newx, newy;
247 int retval = 0; 241 int retval = 0;
248 maptile *mp; 242 maptile *mp;
249 243
250 if (out_of_map (oldmap, x, y))
251 return P_OUT_OF_MAP;
252 newx = x; 244 newx = x;
253 newy = y; 245 newy = y;
246
254 mp = get_map_from_coord (oldmap, &newx, &newy); 247 mp = get_map_from_coord (oldmap, &newx, &newy);
248
249 if (!mp)
250 return P_OUT_OF_MAP;
251
255 if (mp != oldmap) 252 if (mp != oldmap)
256 retval |= P_NEW_MAP; 253 retval |= P_NEW_MAP;
257 if (newmap)
258 *newmap = mp;
259 if (nx)
260 *nx = newx;
261 if (ny)
262 *ny = newy;
263 254
264 retval |= mp->spaces[newx + mp->width * newy].flags; 255 if (newmap) *newmap = mp;
256 if (nx) *nx = newx;
257 if (ny) *ny = newy;
265 258
266 return retval; 259 return retval | mp->at (newx, newy).flags ();
267} 260}
268 261
269/* 262/*
270 * Returns true if the given coordinate is blocked except by the 263 * Returns true if the given coordinate is blocked except by the
271 * object passed is not blocking. This is used with 264 * object passed is not blocking. This is used with
… …
294 } 287 }
295 288
296 /* Save some cycles - instead of calling get_map_flags(), just get the value 289 /* Save some cycles - instead of calling get_map_flags(), just get the value
297 * directly. 290 * directly.
298 */ 291 */
299 mflags = m->spaces[sx + m->width * sy].flags; 292 mflags = m->at (sx, sy).flags ();
300 293
301 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 294 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
302 295
303 /* If space is currently not blocked by anything, no need to 296 /* If space is currently not blocked by anything, no need to
304 * go further. Not true for players - all sorts of special 297 * go further. Not true for players - all sorts of special
… …
323 /* We basically go through the stack of objects, and if there is 316 /* We basically go through the stack of objects, and if there is
324 * some other object that has NO_PASS or FLAG_ALIVE set, return 317 * some other object that has NO_PASS or FLAG_ALIVE set, return
325 * true. If we get through the entire stack, that must mean 318 * true. If we get through the entire stack, that must mean
326 * ob is blocking it, so return 0. 319 * ob is blocking it, so return 0.
327 */ 320 */
328 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 321 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
329 { 322 {
330 323
331 /* This must be before the checks below. Code for inventory checkers. */ 324 /* This must be before the checks below. Code for inventory checkers. */
332 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 325 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
333 { 326 {
… …
397 * 390 *
398 * Note this used to be arch_blocked, but with new movement 391 * Note this used to be arch_blocked, but with new movement
399 * code, we need to have actual object to check its move_type 392 * code, we need to have actual object to check its move_type
400 * against the move_block values. 393 * against the move_block values.
401 */ 394 */
402
403int 395int
404ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 396ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
405{ 397{
406 archetype *tmp; 398 archetype *tmp;
407 int flag; 399 int flag;
… …
413 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 405 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
414 if (flag & P_OUT_OF_MAP) 406 if (flag & P_OUT_OF_MAP)
415 return P_OUT_OF_MAP; 407 return P_OUT_OF_MAP;
416 408
417 /* 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 */
418 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 410 return m1->at (sx, sy).move_block;
419 } 411 }
420 412
421 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 413 for (tmp = ob->arch; tmp; tmp = tmp->more)
422 { 414 {
423 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);
424 416
425 if (flag & P_OUT_OF_MAP) 417 if (flag & P_OUT_OF_MAP)
426 return P_OUT_OF_MAP; 418 return P_OUT_OF_MAP;
427 if (flag & P_IS_ALIVE) 419 if (flag & P_IS_ALIVE)
428 return P_IS_ALIVE; 420 return P_IS_ALIVE;
429 421
422 mapspace &ms = m1->at (sx, sy);
423
424
430 /* find_first_free_spot() calls this function. However, often 425 /* find_first_free_spot() calls this function. However, often
431 * 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)
432 * 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.
433 */ 428 */
434 429
435 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)
436 continue; 431 continue;
437 432
438 /* 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
439 * head of the object should correspond for the entire object. 434 * head of the object should correspond for the entire object.
440 */ 435 */
441 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 436 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
442 return AB_NO_PASS; 437 return P_NO_PASS;
443
444 } 438 }
439
445 return 0; 440 return 0;
446} 441}
447 442
448/* When the map is loaded, load_object does not actually insert objects 443/* When the map is loaded, load_object does not actually insert objects
449 * into inventory, but just links them. What this does is go through 444 * into inventory, but just links them. What this does is go through
… …
476 * 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
477 * 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
478 * 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
479 * the more sections and not re-add sections for them. 474 * the more sections and not re-add sections for them.
480 */ 475 */
481
482static void 476static void
483link_multipart_objects (maptile *m) 477link_multipart_objects (maptile *m)
484{ 478{
485 int x, y; 479 int x, y;
486 object *tmp, *op, *last, *above; 480 object *tmp, *op, *last, *above;
487 archetype *at; 481 archetype *at;
488 482
489 for (x = 0; x < MAP_WIDTH (m); x++) 483 for (x = 0; x < m->width; x++)
490 for (y = 0; y < MAP_HEIGHT (m); y++) 484 for (y = 0; y < m->height; y++)
491 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)
492 { 486 {
493 above = tmp->above; 487 above = tmp->above;
494 488
495 /* already multipart - don't do anything more */ 489 /* already multipart - don't do anything more */
496 if (tmp->head || tmp->more) 490 if (tmp->head || tmp->more)
… …
546 { 540 {
547 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)");
548 continue; 542 continue;
549 } 543 }
550 544
551
552 switch (i) 545 switch (i)
553 { 546 {
554 case LL_NORMAL: 547 case LL_NORMAL:
555 /* 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 */
556 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)
… …
581 { 574 {
582 for (j = 0; j < m->height; j++) 575 for (j = 0; j < m->height; j++)
583 { 576 {
584 unique = 0; 577 unique = 0;
585 /* check for unique items, or unique squares */ 578 /* check for unique items, or unique squares */
586 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 579 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
587 { 580 {
588 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 581 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
589 unique = 1; 582 unique = 1;
590 583
591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 584 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
… …
602 * 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,
603 * 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
604 * in order to do map tiling properly. 597 * in order to do map tiling properly.
605 */ 598 */
606void 599void
607save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) 600save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag)
608{ 601{
609 int i, j = 0, unique = 0; 602 int i, j = 0, unique = 0;
610 object *op; 603 object *op;
611 604
612 /* first pass - save one-part objects */ 605 /* first pass - save one-part objects */
613 for (i = 0; i < MAP_WIDTH (m); i++) 606 for (i = 0; i < m->width; i++)
614 for (j = 0; j < MAP_HEIGHT (m); j++) 607 for (j = 0; j < m->height; j++)
615 { 608 {
616 unique = 0; 609 unique = 0;
610
617 for (op = get_map_ob (m, i, j); op; op = op->above) 611 for (op = m->at (i, j).bot; op; op = op->above)
618 { 612 {
619 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 613 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
620 unique = 1; 614 unique = 1;
621 615
622 if (op->type == PLAYER) 616 if (!op->can_map_save ())
623 {
624 LOG (llevDebug, "Player on map that is being saved\n");
625 continue;
626 }
627
628 if (op->head || op->owner)
629 continue; 617 continue;
630 618
631 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 619 if (unique || op->flag [FLAG_UNIQUE])
632 save_object (fp2, op, 3); 620 save_object (fp2, op, 1);
633 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])))
634 save_object (fp, op, 3); 622 save_object (fp, op, 1);
635 623 }
636 } /* for this space */ 624 }
637 } /* for this j */
638} 625}
639 626
640maptile::maptile () 627maptile::maptile ()
641{ 628{
642 in_memory = MAP_SWAPPED; 629 in_memory = MAP_SWAPPED;
630
643 /* 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
644 * map archetype. Mimic that behaviour. 632 * map archetype. Mimic that behaviour.
645 */ 633 */
646 MAP_WIDTH (this) = 16; 634 width = 16;
647 MAP_HEIGHT (this) = 16; 635 height = 16;
648 MAP_RESET_TIMEOUT (this) = 0; 636 reset_timeout = 0;
649 MAP_TIMEOUT (this) = 300; 637 timeout = 300;
650 MAP_ENTER_X (this) = 0; 638 enter_x = 0;
651 MAP_ENTER_Y (this) = 0; 639 enter_y = 0;
652 /*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 */
653 MAP_WORLDPARTX (this) = -1; 641 worldpartx = -1;
654 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 }
655} 664}
656 665
657/* 666/*
658 * Allocates, initialises, and returns a pointer to a maptile. 667 * Allocates, initialises, and returns a pointer to a maptile.
659 * 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
660 * used anyways. MSW 2001-07-01 669 * used anyways. MSW 2001-07-01
661 */ 670 */
662maptile * 671maptile *
663get_linked_map (void) 672get_linked_map (void)
664{ 673{
665 maptile *mp, *map = new maptile; 674 maptile *map = new maptile;
666 675 map->link ();
667 for (mp = first_map; mp && mp->next; mp = mp->next);
668
669 if (mp == NULL)
670 first_map = map;
671 else
672 mp->next = map;
673
674 return map; 676 return map;
675} 677}
676 678
677/* 679/*
678 * Allocates the arrays contained in a maptile. 680 * Allocates the arrays contained in a maptile.
… …
689 * that is their poor assumption. 691 * that is their poor assumption.
690 */ 692 */
691 if (spaces) 693 if (spaces)
692 { 694 {
693 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);
694 free (spaces); 696 sfree (spaces, size ());
695 } 697 }
696 698
697 spaces = (MapSpace *) 699 spaces = salloc0<mapspace> (size ());
698 calloc (1, width * height * sizeof (MapSpace));
699
700 if (!spaces)
701 fatal (OUT_OF_MEMORY);
702} 700}
703 701
704/* Create and returns a map of the specific size. Used 702/* Create and returns a map of the specific size. Used
705 * in random map code and the editor. 703 * in random map code and the editor.
706 */ 704 */
… …
739 p = strchr (p, ';'); 737 p = strchr (p, ';');
740 number_of_entries++; 738 number_of_entries++;
741 if (p) 739 if (p)
742 p++; 740 p++;
743 } 741 }
742
744 p = shop_string; 743 p = shop_string;
745 strip_endline (p); 744 strip_endline (p);
746 items = new shopitems[number_of_entries + 1]; 745 items = new shopitems[number_of_entries + 1];
747 for (i = 0; i < number_of_entries; i++) 746 for (i = 0; i < number_of_entries; i++)
748 { 747 {
749 if (!p) 748 if (!p)
750 { 749 {
751 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");
752 break; 751 break;
753 } 752 }
753
754 next_semicolon = strchr (p, ';'); 754 next_semicolon = strchr (p, ';');
755 next_colon = strchr (p, ':'); 755 next_colon = strchr (p, ':');
756 /* 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. */
757 if (next_colon && (!next_semicolon || next_colon < next_semicolon)) 757 if (next_colon && (!next_semicolon || next_colon < next_semicolon))
758 items[i].strength = atoi (strchr (p, ':') + 1); 758 items[i].strength = atoi (strchr (p, ':') + 1);
… …
785 * 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
786 */ 786 */
787 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);
788 } 788 }
789 } 789 }
790
790 items[i].index = number_of_entries; 791 items[i].index = number_of_entries;
791 if (next_semicolon) 792 if (next_semicolon)
792 p = ++next_semicolon; 793 p = ++next_semicolon;
793 else 794 else
794 p = NULL; 795 p = NULL;
795 } 796 }
797
796 free (shop_string); 798 free (shop_string);
797 return items; 799 return items;
798} 800}
799 801
800/* 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
… …
809 for (i = 0; i < m->shopitems[0].index; i++) 811 for (i = 0; i < m->shopitems[0].index; i++)
810 { 812 {
811 if (m->shopitems[i].typenum) 813 if (m->shopitems[i].typenum)
812 { 814 {
813 if (m->shopitems[i].strength) 815 if (m->shopitems[i].strength)
814 {
815 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);
816 }
817 else 817 else
818 sprintf (tmp, "%s;", m->shopitems[i].name); 818 sprintf (tmp, "%s;", m->shopitems[i].name);
819 } 819 }
820 else 820 else
821 { 821 {
822 if (m->shopitems[i].strength) 822 if (m->shopitems[i].strength)
823 {
824 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 823 sprintf (tmp, "*:%d;", m->shopitems[i].strength);
825 }
826 else 824 else
827 sprintf (tmp, "*"); 825 sprintf (tmp, "*");
828 } 826 }
827
829 strcat (output_string, tmp); 828 strcat (output_string, tmp);
830 } 829 }
831} 830}
832 831
833/* This loads the header information of the map. The header 832/* This loads the header information of the map. The header
… …
1101 * 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
1102 * cases, no matter if this flag is set or not. 1101 * cases, no matter if this flag is set or not.
1103 * 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
1104 * managed map list. 1103 * managed map list.
1105 */ 1104 */
1106
1107maptile * 1105maptile *
1108load_original_map (const char *filename, int flags) 1106load_original_map (const char *filename, int flags)
1109{ 1107{
1110 maptile *m; 1108 maptile *m;
1111 char pathname[MAX_BUF]; 1109 char pathname[MAX_BUF];
… …
1129 strcpy (m->path, filename); 1127 strcpy (m->path, filename);
1130 if (load_map_header (thawer, m)) 1128 if (load_map_header (thawer, m))
1131 { 1129 {
1132 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);
1133 delete_map (m); 1131 delete_map (m);
1134 return NULL; 1132 return 0;
1135 } 1133 }
1136 1134
1137 m->allocate (); 1135 m->allocate ();
1138 1136
1139 m->in_memory = MAP_LOADING; 1137 m->in_memory = MAP_LOADING;
1140 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1138 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1141 1139
1142 m->in_memory = MAP_IN_MEMORY; 1140 m->in_memory = MAP_IN_MEMORY;
1143 if (!MAP_DIFFICULTY (m)) 1141 if (!m->difficulty)
1144 MAP_DIFFICULTY (m) = calculate_difficulty (m); 1142 m->difficulty = calculate_difficulty (m);
1145 set_map_reset_time (m); 1143 set_map_reset_time (m);
1146 m->instantiate (); 1144 m->instantiate ();
1147 return (m); 1145 return (m);
1148} 1146}
1149 1147
1150/* 1148/*
1151 * Loads a map, which has been loaded earlier, from file. 1149 * Loads a map, which has been loaded earlier, from file.
1152 * 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
1153 * option if we can't find the original map) 1151 * option if we can't find the original map)
1154 */ 1152 */
1155
1156static maptile * 1153static maptile *
1157load_temporary_map (maptile *m) 1154load_temporary_map (maptile *m)
1158{ 1155{
1159 char buf[MAX_BUF]; 1156 char buf[MAX_BUF];
1160 1157
… …
1204/* 1201/*
1205 * Loads a map, which has been loaded earlier, from file. 1202 * Loads a map, which has been loaded earlier, from file.
1206 * 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
1207 * option if we can't find the original map) 1204 * option if we can't find the original map)
1208 */ 1205 */
1209
1210maptile * 1206maptile *
1211load_overlay_map (const char *filename, maptile *m) 1207load_overlay_map (const char *filename, maptile *m)
1212{ 1208{
1213 char pathname[MAX_BUF]; 1209 char pathname[MAX_BUF];
1214 1210
… …
1222 if (load_map_header (thawer, m)) 1218 if (load_map_header (thawer, m))
1223 { 1219 {
1224 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);
1225 delete_map (m); 1221 delete_map (m);
1226 m = load_original_map (m->path, 0); 1222 m = load_original_map (m->path, 0);
1227 return NULL; 1223 return 0;
1228 } 1224 }
1229 /*m->allocate ();*/ 1225 /*m->allocate ();*/
1230 1226
1231 m->in_memory = MAP_LOADING; 1227 m->in_memory = MAP_LOADING;
1232 load_objects (m, thawer, MAP_OVERLAY); 1228 load_objects (m, thawer, MAP_OVERLAY);
… …
1244delete_unique_items (maptile *m) 1240delete_unique_items (maptile *m)
1245{ 1241{
1246 int i, j, unique; 1242 int i, j, unique;
1247 object *op, *next; 1243 object *op, *next;
1248 1244
1249 for (i = 0; i < MAP_WIDTH (m); i++) 1245 for (i = 0; i < m->width; i++)
1250 for (j = 0; j < MAP_HEIGHT (m); j++) 1246 for (j = 0; j < m->height; j++)
1251 { 1247 {
1252 unique = 0; 1248 unique = 0;
1253 1249
1254 for (op = get_map_ob (m, i, j); op; op = next) 1250 for (op = GET_MAP_OB (m, i, j); op; op = next)
1255 { 1251 {
1256 next = op->above; 1252 next = op->above;
1257 1253
1258 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))
1259 unique = 1; 1255 unique = 1;
1260 1256
1261 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1257 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1262 { 1258 {
1263 clean_object (op); 1259 op->destroy_inv (false);
1264
1265 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1266 remove_button_link (op);
1267
1268 op->destroy (); 1260 op->destroy ();
1269 } 1261 }
1270 } 1262 }
1271 } 1263 }
1272} 1264}
1273 1265
1274
1275/* 1266/*
1276 * 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
1277 * m is the map to load unique items into. 1268 * m is the map to load unique items into.
1278 */ 1269 */
1279static void 1270static void
… …
1298 return; 1289 return;
1299 1290
1300 m->in_memory = MAP_LOADING; 1291 m->in_memory = MAP_LOADING;
1301 if (m->tmpname == NULL) /* if we have loaded unique items from */ 1292 if (m->tmpname == NULL) /* if we have loaded unique items from */
1302 delete_unique_items (m); /* original map before, don't duplicate them */ 1293 delete_unique_items (m); /* original map before, don't duplicate them */
1294
1303 load_objects (m, thawer, 0); 1295 load_objects (m, thawer, 0);
1304 1296
1305 m->in_memory = MAP_IN_MEMORY; 1297 m->in_memory = MAP_IN_MEMORY;
1306} 1298}
1307
1308 1299
1309/* 1300/*
1310 * 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
1311 * file it was (originally) loaded from. Otherwise a temporary 1302 * file it was (originally) loaded from. Otherwise a temporary
1312 * filename will be genarated, and the file will be stored there. 1303 * filename will be genarated, and the file will be stored there.
1313 * The temporary filename will be stored in the maptileure. 1304 * The temporary filename will be stored in the maptileure.
1314 * 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
1315 * (this should have been updated when first loaded) 1306 * (this should have been updated when first loaded)
1316 */ 1307 */
1317
1318int 1308int
1319new_save_map (maptile *m, int flag) 1309new_save_map (maptile *m, int flag)
1320{ 1310{
1321 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; 1311 char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF];
1322 int i; 1312 int i;
… …
1454 freezer.save (filename); 1444 freezer.save (filename);
1455 1445
1456 return 0; 1446 return 0;
1457} 1447}
1458 1448
1459
1460/*
1461 * Remove and free all objects in the inventory of the given object.
1462 * object.c ?
1463 */
1464
1465void
1466clean_object (object *op)
1467{
1468 object *tmp, *next;
1469
1470 for (tmp = op->inv; tmp; tmp = next)
1471 {
1472 next = tmp->below;
1473
1474 clean_object (tmp);
1475 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1476 remove_button_link (tmp);
1477
1478 tmp->destroy ();
1479 }
1480}
1481
1482/* 1449/*
1483 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1484 */ 1451 */
1485
1486void 1452void
1487free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1488{ 1454{
1489 int i, j; 1455 if (!m->spaces)
1490 object *op; 1456 return;
1491 1457
1492 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1493 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1494 { 1460 {
1495 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1496 1462
1497 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bot)
1498 { 1464 {
1499 if (op == previous_obj)
1500 {
1501 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1502 break;
1503 }
1504
1505 previous_obj = op;
1506
1507 if (op->head != NULL) 1465 if (op->head)
1508 op = op->head; 1466 op = op->head;
1509 1467
1510 /* If the map isn't in memory, free_object will remove and 1468 op->destroy_inv (false);
1511 * free objects in op's inventory. So let it do the job.
1512 */
1513 if (m->in_memory == MAP_IN_MEMORY)
1514 clean_object (op);
1515
1516 op->destroy (); 1469 op->destroy ();
1517 } 1470 }
1518 } 1471 }
1519} 1472}
1520 1473
1521/* 1474/*
1522 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1523 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1524 */ 1477 */
1525
1526void 1478void
1527free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1528{ 1480{
1529 int i; 1481 if (!m->in_memory) //TODO: makes no sense to me?
1530
1531 if (!m->in_memory)
1532 {
1533 LOG (llevError, "Trying to free freed map.\n");
1534 return; 1482 return;
1535 } 1483
1484 m->in_memory = MAP_SAVING;
1536 1485
1537 // TODO: use new/delete 1486 // TODO: use new/delete
1538#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1539 1487
1540 if (flag && m->spaces) 1488 if (flag && m->spaces)
1541 free_all_objects (m); 1489 free_all_objects (m);
1542 if (m->name)
1543 FREE_AND_CLEAR (m->name);
1544 if (m->spaces)
1545 FREE_AND_CLEAR (m->spaces);
1546 if (m->msg)
1547 FREE_AND_CLEAR (m->msg);
1548 if (m->maplore)
1549 FREE_AND_CLEAR (m->maplore);
1550 1490
1551 delete [] m->shopitems; 1491 sfree (m->spaces, m->size ()), m->spaces = 0;
1552 m->shopitems = 0;
1553 1492
1554 if (m->shoprace) 1493 free (m->name), m->name = 0;
1555 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;
1556 1498
1557 if (m->buttons) 1499 if (m->buttons)
1558 free_objectlinkpt (m->buttons); 1500 free_objectlinkpt (m->buttons), m->buttons = 0;
1559 1501
1560 m->buttons = NULL;
1561
1562 for (i = 0; i < 4; i++) 1502 for (int i = 0; i < 4; i++)
1563 { 1503 free (m->tile_path[i]), m->tile_path[i] = 0;
1564 if (m->tile_path[i])
1565 FREE_AND_CLEAR (m->tile_path[i]);
1566 m->tile_map[i] = NULL;
1567 }
1568 1504
1569 m->in_memory = MAP_SWAPPED; 1505 m->in_memory = MAP_SWAPPED;
1570
1571#undef FREE_AND_CLEAR
1572
1573} 1506}
1574 1507
1575/* 1508maptile::~maptile ()
1576 * function: vanish maptile 1509{
1577 * m : pointer to maptile, if NULL no action 1510 assert (destroyed ());
1578 * this deletes all the data on the map (freeing pointers) 1511}
1579 * 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.
1580 */ 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}
1581 1534
1535//TODO: must go
1582void 1536void
1583delete_map (maptile *m) 1537delete_map (maptile *m)
1584{ 1538{
1585 maptile *tmp, *last;
1586 int i;
1587
1588 if (!m) 1539 if (m)
1589 return; 1540 m->destroy ();
1590
1591 m->clear ();
1592
1593 if (m->in_memory == MAP_IN_MEMORY)
1594 {
1595 /* change to MAP_SAVING, even though we are not,
1596 * so that remove_ob doesn't do as much work.
1597 */
1598 m->in_memory = MAP_SAVING;
1599 free_map (m, 1);
1600 }
1601 /* move this out of free_map, since tmpname can still be needed if
1602 * the map is swapped out.
1603 */
1604 if (m->tmpname)
1605 {
1606 free (m->tmpname);
1607 m->tmpname = NULL;
1608 }
1609 last = NULL;
1610 /* We need to look through all the maps and see if any maps
1611 * are pointing at this one for tiling information. Since
1612 * tiling can be assymetric, we just can not look to see which
1613 * maps this map tiles with and clears those.
1614 */
1615 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1616 {
1617 if (tmp->next == m)
1618 last = tmp;
1619
1620 /* This should hopefully get unrolled on a decent compiler */
1621 for (i = 0; i < 4; i++)
1622 if (tmp->tile_map[i] == m)
1623 tmp->tile_map[i] = NULL;
1624 }
1625
1626 /* If last is null, then this should be the first map in the list */
1627 if (!last)
1628 {
1629 if (m == first_map)
1630 first_map = m->next;
1631 else
1632 /* m->path is a static char, so should hopefully still have
1633 * some useful data in it.
1634 */
1635 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1636 }
1637 else
1638 last->next = m->next;
1639
1640 delete m;
1641} 1541}
1642 1542
1643/* 1543/*
1644 * Makes sure the given map is loaded and swapped in. 1544 * Makes sure the given map is loaded and swapped in.
1645 * name is path name of the map. 1545 * name is path name of the map.
… …
1652 * Returns a pointer to the given map. 1552 * Returns a pointer to the given map.
1653 */ 1553 */
1654maptile * 1554maptile *
1655ready_map_name (const char *name, int flags) 1555ready_map_name (const char *name, int flags)
1656{ 1556{
1657 maptile *m;
1658
1659 if (!name) 1557 if (!name)
1660 return (NULL); 1558 return 0;
1661 1559
1662 /* Have we been at this level before? */ 1560 /* Have we been at this level before? */
1663 m = has_been_loaded (name); 1561 maptile *m = has_been_loaded (name);
1664 1562
1665 /* Map is good to go, so just return it */ 1563 /* Map is good to go, so just return it */
1666 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))
1667 {
1668 return m; 1565 return m;
1669 }
1670 1566
1671 /* unique maps always get loaded from their original location, and never 1567 /* unique maps always get loaded from their original location, and never
1672 * 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
1673 * 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 -
1674 * 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
… …
1676 * 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
1677 * 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.
1678 */ 1574 */
1679 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1575 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1680 { 1576 {
1681
1682 /* first visit or time to reset */ 1577 /* first visit or time to reset */
1683 if (m) 1578 if (m)
1684 { 1579 {
1685 clean_tmp_map (m); /* Doesn't make much difference */ 1580 clean_tmp_map (m); /* Doesn't make much difference */
1686 delete_map (m); 1581 delete_map (m);
… …
1690 if (flags & MAP_PLAYER_UNIQUE) 1585 if (flags & MAP_PLAYER_UNIQUE)
1691 LOG (llevDebug, "Trying to load map %s.\n", name); 1586 LOG (llevDebug, "Trying to load map %s.\n", name);
1692 else 1587 else
1693 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); 1588 LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name));
1694 1589
1695 //eval_pv ("$x = Event::time", 1);//D
1696 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) 1590 if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE))))
1697 return (NULL); 1591 return (NULL);
1698 //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
1699 1592
1700 fix_auto_apply (m); /* Chests which open as default */ 1593 fix_auto_apply (m); /* Chests which open as default */
1701 1594
1702 /* 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.
1703 * if from the editor, likewise. 1596 * if from the editor, likewise.
… …
1773 int x, y, i; 1666 int x, y, i;
1774 long monster_cnt = 0; 1667 long monster_cnt = 0;
1775 double avgexp = 0; 1668 double avgexp = 0;
1776 sint64 total_exp = 0; 1669 sint64 total_exp = 0;
1777 1670
1778 if (MAP_DIFFICULTY (m)) 1671 if (m->difficulty)
1779 { 1672 {
1780 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1673 LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty);
1781 return MAP_DIFFICULTY (m); 1674 return m->difficulty;
1782 } 1675 }
1783 1676
1784 for (x = 0; x < MAP_WIDTH (m); x++) 1677 for (x = 0; x < m->width; x++)
1785 for (y = 0; y < MAP_HEIGHT (m); y++) 1678 for (y = 0; y < m->height; y++)
1786 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)
1787 { 1680 {
1788 if (QUERY_FLAG (op, FLAG_MONSTER)) 1681 if (QUERY_FLAG (op, FLAG_MONSTER))
1789 { 1682 {
1790 total_exp += op->stats.exp; 1683 total_exp += op->stats.exp;
1791 monster_cnt++; 1684 monster_cnt++;
… …
1839 if (first_map->in_memory == MAP_SAVING) 1732 if (first_map->in_memory == MAP_SAVING)
1840 first_map->in_memory = MAP_IN_MEMORY; 1733 first_map->in_memory = MAP_IN_MEMORY;
1841 delete_map (first_map); 1734 delete_map (first_map);
1842 real_maps++; 1735 real_maps++;
1843 } 1736 }
1737
1844 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); 1738 LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps);
1845} 1739}
1846 1740
1847/* change_map_light() - used to change map light level (darkness) 1741/* change_map_light() - used to change map light level (darkness)
1848 * up or down. Returns true if successful. It should now be 1742 * up or down. Returns true if successful. It should now be
… …
1884 /* All clients need to get re-updated for the change */ 1778 /* All clients need to get re-updated for the change */
1885 update_all_map_los (m); 1779 update_all_map_los (m);
1886 return 1; 1780 return 1;
1887} 1781}
1888 1782
1889
1890/* 1783/*
1891 * This function updates various attributes about a specific space 1784 * This function updates various attributes about a specific space
1892 * on the map (what it looks like, whether it blocks magic, 1785 * on the map (what it looks like, whether it blocks magic,
1893 * has a living creatures, prevents people from passing 1786 * has a living creatures, prevents people from passing
1894 * through, etc) 1787 * through, etc)
1895 */ 1788 */
1896void 1789void
1897update_position (maptile *m, int x, int y) 1790mapspace::update_ ()
1898{ 1791{
1899 object *tmp, *last = NULL; 1792 object *tmp, *last = 0;
1900 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1793 uint8 flags = 0, light = 0, anywhere = 0;
1901 New_Face *top, *floor, *middle; 1794 New_Face *top, *floor, *middle;
1902 object *top_obj, *floor_obj, *middle_obj; 1795 object *top_obj, *floor_obj, *middle_obj;
1903 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1796 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1904 1797
1905 oldflags = GET_MAP_FLAGS (m, x, y);
1906 if (!(oldflags & P_NEED_UPDATE))
1907 {
1908 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1909 return;
1910 }
1911
1912 middle = blank_face; 1798 middle = blank_face;
1913 top = blank_face; 1799 top = blank_face;
1914 floor = blank_face; 1800 floor = blank_face;
1915 1801
1916 middle_obj = NULL; 1802 middle_obj = 0;
1917 top_obj = NULL; 1803 top_obj = 0;
1918 floor_obj = NULL; 1804 floor_obj = 0;
1919 1805
1920 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1806 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1921 { 1807 {
1922
1923 /* This could be made additive I guess (two lights better than 1808 /* This could be made additive I guess (two lights better than
1924 * 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
1925 * light bulbs do not illuminate twice as far as once since 1810 * light bulbs do not illuminate twice as far as once since
1926 * it is a disapation factor that is squared (or is it cubed?) 1811 * it is a dissapation factor that is cubed.
1927 */ 1812 */
1928 if (tmp->glow_radius > light) 1813 if (tmp->glow_radius > light)
1929 light = tmp->glow_radius; 1814 light = tmp->glow_radius;
1930 1815
1931 /* This call is needed in order to update objects the player 1816 /* This call is needed in order to update objects the player
… …
1969 { 1854 {
1970 middle = tmp->face; 1855 middle = tmp->face;
1971 middle_obj = tmp; 1856 middle_obj = tmp;
1972 } 1857 }
1973 } 1858 }
1859
1974 if (tmp == tmp->above) 1860 if (tmp == tmp->above)
1975 { 1861 {
1976 LOG (llevError, "Error in structure of map\n"); 1862 LOG (llevError, "Error in structure of map\n");
1977 exit (-1); 1863 exit (-1);
1978 } 1864 }
1979 1865
1980 move_slow |= tmp->move_slow; 1866 move_slow |= tmp->move_slow;
1981 move_block |= tmp->move_block; 1867 move_block |= tmp->move_block;
1982 move_on |= tmp->move_on; 1868 move_on |= tmp->move_on;
1983 move_off |= tmp->move_off; 1869 move_off |= tmp->move_off;
1984 move_allow |= tmp->move_allow; 1870 move_allow |= tmp->move_allow;
1985 1871
1986 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1987 flags |= P_IS_ALIVE;
1988 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
1989 flags |= P_NO_MAGIC;
1990 if (QUERY_FLAG (tmp, FLAG_DAMNED))
1991 flags |= P_NO_CLERIC;
1992 if (tmp->type == SAFE_GROUND)
1993 flags |= P_SAFE;
1994
1995 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1872 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
1996 flags |= P_BLOCKSVIEW; 1873 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
1997 } /* for stack of objects */ 1874 if (tmp->type == PLAYER) flags |= P_PLAYER;
1998 1875 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1999 /* we don't want to rely on this function to have accurate flags, but 1876 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2000 * since we're already doing the work, we calculate them here. 1877 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2001 * if they don't match, logic is broken someplace.
2002 */
2003 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2004 { 1878 }
2005 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1879
2006 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1880 this->light = light;
2007 } 1881 this->flags_ = flags;
2008 SET_MAP_FLAGS (m, x, y, flags); 1882 this->move_block = move_block & ~move_allow;
2009 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1883 this->move_on = move_on;
2010 SET_MAP_MOVE_ON (m, x, y, move_on); 1884 this->move_off = move_off;
2011 SET_MAP_MOVE_OFF (m, x, y, move_off); 1885 this->move_slow = move_slow;
2012 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2013 1886
2014 /* At this point, we have a floor face (if there is a floor), 1887 /* At this point, we have a floor face (if there is a floor),
2015 * and the floor is set - we are not going to touch it at 1888 * and the floor is set - we are not going to touch it at
2016 * this point. 1889 * this point.
2017 * middle contains the highest visibility face. 1890 * middle contains the highest visibility face.
… …
2071 break; 1944 break;
2072 } 1945 }
2073 } 1946 }
2074 } 1947 }
2075 } 1948 }
1949
2076 if (middle == floor) 1950 if (middle == floor)
2077 middle = blank_face; 1951 middle = blank_face;
1952
2078 if (top == middle) 1953 if (top == middle)
2079 middle = blank_face; 1954 middle = blank_face;
2080 SET_MAP_FACE (m, x, y, top, 0);
2081 if (top != blank_face)
2082 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2083 else
2084 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2085 SET_MAP_FACE (m, x, y, middle, 1);
2086 if (middle != blank_face)
2087 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2088 else
2089 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2090 SET_MAP_FACE (m, x, y, floor, 2);
2091 if (floor != blank_face)
2092 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2093 else
2094 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2095 SET_MAP_LIGHT (m, x, y, light);
2096}
2097 1955
1956 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1957 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1958 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1959}
2098 1960
2099void 1961void
2100set_map_reset_time (maptile *map) 1962set_map_reset_time (maptile *map)
2101{ 1963{
2102 int timeout; 1964 int timeout;
2103 1965
2104 timeout = MAP_RESET_TIMEOUT (map); 1966 timeout = map->reset_timeout;
2105 if (timeout <= 0) 1967 if (timeout <= 0)
2106 timeout = MAP_DEFAULTRESET; 1968 timeout = MAP_DEFAULTRESET;
2107 if (timeout >= MAP_MAXRESET) 1969 if (timeout >= MAP_MAXRESET)
2108 timeout = MAP_MAXRESET; 1970 timeout = MAP_MAXRESET;
2109 MAP_WHEN_RESET (map) = time (0) + timeout; 1971 map->reset_time = time (0) + timeout;
2110} 1972}
2111 1973
2112/* 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
2113 * 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
2114 * 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
… …
2142 * 2004 *
2143 */ 2005 */
2144int 2006int
2145out_of_map (maptile *m, int x, int y) 2007out_of_map (maptile *m, int x, int y)
2146{ 2008{
2147
2148 /* If we get passed a null map, this is obviously the 2009 /* If we get passed a null map, this is obviously the
2149 * case. This generally shouldn't happen, but if the 2010 * case. This generally shouldn't happen, but if the
2150 * map loads fail below, it could happen. 2011 * map loads fail below, it could happen.
2151 */ 2012 */
2152 if (!m) 2013 if (!m)
… …
2154 2015
2155 if (x < 0) 2016 if (x < 0)
2156 { 2017 {
2157 if (!m->tile_path[3]) 2018 if (!m->tile_path[3])
2158 return 1; 2019 return 1;
2020
2159 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)
2160 {
2161 load_and_link_tiled_map (m, 3); 2022 load_and_link_tiled_map (m, 3);
2162 } 2023
2163 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));
2164 } 2025 }
2165 if (x >= MAP_WIDTH (m)) 2026
2027 if (x >= m->width)
2166 { 2028 {
2167 if (!m->tile_path[1]) 2029 if (!m->tile_path[1])
2168 return 1; 2030 return 1;
2031
2169 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)
2170 {
2171 load_and_link_tiled_map (m, 1); 2033 load_and_link_tiled_map (m, 1);
2172 } 2034
2173 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));
2174 } 2036 }
2037
2175 if (y < 0) 2038 if (y < 0)
2176 { 2039 {
2177 if (!m->tile_path[0]) 2040 if (!m->tile_path[0])
2178 return 1; 2041 return 1;
2042
2179 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)
2180 {
2181 load_and_link_tiled_map (m, 0); 2044 load_and_link_tiled_map (m, 0);
2182 } 2045
2183 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));
2184 } 2047 }
2185 if (y >= MAP_HEIGHT (m)) 2048
2049 if (y >= m->height)
2186 { 2050 {
2187 if (!m->tile_path[2]) 2051 if (!m->tile_path[2])
2188 return 1; 2052 return 1;
2053
2189 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)
2190 {
2191 load_and_link_tiled_map (m, 2); 2055 load_and_link_tiled_map (m, 2);
2192 } 2056
2193 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));
2194 } 2058 }
2195 2059
2196 /* Simple case - coordinates are within this local 2060 /* Simple case - coordinates are within this local
2197 * map. 2061 * map.
2198 */ 2062 */
… …
2212{ 2076{
2213 2077
2214 if (*x < 0) 2078 if (*x < 0)
2215 { 2079 {
2216 if (!m->tile_path[3]) 2080 if (!m->tile_path[3])
2217 return NULL; 2081 return 0;
2218 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)
2219 load_and_link_tiled_map (m, 3); 2083 load_and_link_tiled_map (m, 3);
2220 2084
2221 *x += MAP_WIDTH (m->tile_map[3]); 2085 *x += m->tile_map[3]->width;
2222 return (get_map_from_coord (m->tile_map[3], x, y)); 2086 return (get_map_from_coord (m->tile_map[3], x, y));
2223 } 2087 }
2224 if (*x >= MAP_WIDTH (m)) 2088
2089 if (*x >= m->width)
2225 { 2090 {
2226 if (!m->tile_path[1]) 2091 if (!m->tile_path[1])
2227 return NULL; 2092 return 0;
2093
2228 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)
2229 load_and_link_tiled_map (m, 1); 2095 load_and_link_tiled_map (m, 1);
2230 2096
2231 *x -= MAP_WIDTH (m); 2097 *x -= m->width;
2232 return (get_map_from_coord (m->tile_map[1], x, y)); 2098 return (get_map_from_coord (m->tile_map[1], x, y));
2233 } 2099 }
2100
2234 if (*y < 0) 2101 if (*y < 0)
2235 { 2102 {
2236 if (!m->tile_path[0]) 2103 if (!m->tile_path[0])
2237 return NULL; 2104 return 0;
2105
2238 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)
2239 load_and_link_tiled_map (m, 0); 2107 load_and_link_tiled_map (m, 0);
2240 2108
2241 *y += MAP_HEIGHT (m->tile_map[0]); 2109 *y += m->tile_map[0]->height;
2242 return (get_map_from_coord (m->tile_map[0], x, y)); 2110 return (get_map_from_coord (m->tile_map[0], x, y));
2243 } 2111 }
2244 if (*y >= MAP_HEIGHT (m)) 2112
2113 if (*y >= m->height)
2245 { 2114 {
2246 if (!m->tile_path[2]) 2115 if (!m->tile_path[2])
2247 return NULL; 2116 return 0;
2117
2248 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)
2249 load_and_link_tiled_map (m, 2); 2119 load_and_link_tiled_map (m, 2);
2250 2120
2251 *y -= MAP_HEIGHT (m); 2121 *y -= m->height;
2252 return (get_map_from_coord (m->tile_map[2], x, y)); 2122 return (get_map_from_coord (m->tile_map[2], x, y));
2253 } 2123 }
2254 2124
2255 /* Simple case - coordinates are within this local 2125 /* Simple case - coordinates are within this local
2256 * map. 2126 * map.
… …
2276 2146
2277 } 2147 }
2278 else if (map1->tile_map[0] == map2) 2148 else if (map1->tile_map[0] == map2)
2279 { /* up */ 2149 { /* up */
2280 *dx = 0; 2150 *dx = 0;
2281 *dy = -MAP_HEIGHT (map2); 2151 *dy = -map2->height;
2282 } 2152 }
2283 else if (map1->tile_map[1] == map2) 2153 else if (map1->tile_map[1] == map2)
2284 { /* right */ 2154 { /* right */
2285 *dx = MAP_WIDTH (map1); 2155 *dx = map1->width;
2286 *dy = 0; 2156 *dy = 0;
2287 } 2157 }
2288 else if (map1->tile_map[2] == map2) 2158 else if (map1->tile_map[2] == map2)
2289 { /* down */ 2159 { /* down */
2290 *dx = 0; 2160 *dx = 0;
2291 *dy = MAP_HEIGHT (map1); 2161 *dy = map1->height;
2292 } 2162 }
2293 else if (map1->tile_map[3] == map2) 2163 else if (map1->tile_map[3] == map2)
2294 { /* left */ 2164 { /* left */
2295 *dx = -MAP_WIDTH (map2); 2165 *dx = -map2->width;
2296 *dy = 0; 2166 *dy = 0;
2297 2167
2298 } 2168 }
2299 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)
2300 { /* up right */ 2170 { /* up right */
2301 *dx = MAP_WIDTH (map1->tile_map[0]); 2171 *dx = map1->tile_map[0]->width;
2302 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2172 *dy = -map1->tile_map[0]->height;
2303 } 2173 }
2304 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)
2305 { /* up left */ 2175 { /* up left */
2306 *dx = -MAP_WIDTH (map2); 2176 *dx = -map2->width;
2307 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2177 *dy = -map1->tile_map[0]->height;
2308 } 2178 }
2309 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)
2310 { /* right up */ 2180 { /* right up */
2311 *dx = MAP_WIDTH (map1); 2181 *dx = map1->width;
2312 *dy = -MAP_HEIGHT (map2); 2182 *dy = -map2->height;
2313 } 2183 }
2314 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)
2315 { /* right down */ 2185 { /* right down */
2316 *dx = MAP_WIDTH (map1); 2186 *dx = map1->width;
2317 *dy = MAP_HEIGHT (map1->tile_map[1]); 2187 *dy = map1->tile_map[1]->height;
2318 } 2188 }
2319 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)
2320 { /* down right */ 2190 { /* down right */
2321 *dx = MAP_WIDTH (map1->tile_map[2]); 2191 *dx = map1->tile_map[2]->width;
2322 *dy = MAP_HEIGHT (map1); 2192 *dy = map1->height;
2323 } 2193 }
2324 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)
2325 { /* down left */ 2195 { /* down left */
2326 *dx = -MAP_WIDTH (map2); 2196 *dx = -map2->width;
2327 *dy = MAP_HEIGHT (map1); 2197 *dy = map1->height;
2328 } 2198 }
2329 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)
2330 { /* left up */ 2200 { /* left up */
2331 *dx = -MAP_WIDTH (map1->tile_map[3]); 2201 *dx = -map1->tile_map[3]->width;
2332 *dy = -MAP_HEIGHT (map2); 2202 *dy = -map2->height;
2333 } 2203 }
2334 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)
2335 { /* left down */ 2205 { /* left down */
2336 *dx = -MAP_WIDTH (map1->tile_map[3]); 2206 *dx = -map1->tile_map[3]->width;
2337 *dy = MAP_HEIGHT (map1->tile_map[3]); 2207 *dy = map1->tile_map[3]->height;
2338 2208
2339 } 2209 }
2340 else 2210 else
2341 { /* not "adjacent" enough */ 2211 { /* not "adjacent" enough */
2342 return 0; 2212 return 0;
… …
2467{ 2337{
2468 int dx, dy; 2338 int dx, dy;
2469 2339
2470 return adjacent_map (op1->map, op2->map, &dx, &dy); 2340 return adjacent_map (op1->map, op2->map, &dx, &dy);
2471} 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