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