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.32 by root, Thu Oct 5 16:50:06 2006 UTC vs.
Revision 1.45 by root, Wed Dec 20 09:14:21 2006 UTC

… …
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h> 26#include <funcpoint.h>
27 27
28#include <loader.h> 28#include <loader.h>
29#ifndef WIN32 /* ---win32 exclude header */
30# include <unistd.h> 29#include <unistd.h>
31#endif /* win32 */
32 30
33#include "path.h" 31#include "path.h"
34
35
36extern int nrofallocobjects, nroffreeobjects;
37 32
38/* 33/*
39 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
40 * return NULL if no match is found. 35 * return NULL if no match is found.
41 */ 36 */
… …
159int 154int
160check_path (const char *name, int prepend_dir) 155check_path (const char *name, int prepend_dir)
161{ 156{
162 char buf[MAX_BUF]; 157 char buf[MAX_BUF];
163 158
164#ifndef WIN32
165 char *endbuf; 159 char *endbuf;
166 struct stat statbuf; 160 struct stat statbuf;
167 int mode = 0; 161 int mode = 0;
168#endif
169 162
170 if (prepend_dir) 163 if (prepend_dir)
171 strcpy (buf, create_pathname (name)); 164 strcpy (buf, create_pathname (name));
172 else 165 else
173 strcpy (buf, name); 166 strcpy (buf, name);
174#ifdef WIN32 /* ***win32: check this sucker in windows style. */
175 return (_access (buf, 0));
176#else
177 167
178 /* old method (strchr(buf, '\0')) seemd very odd to me - 168 /* old method (strchr(buf, '\0')) seemd very odd to me -
179 * this method should be equivalant and is clearer. 169 * this method should be equivalant and is clearer.
180 * Can not use strcat because we need to cycle through 170 * Can not use strcat because we need to cycle through
181 * all the names. 171 * all the names.
… …
194 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 184 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
195 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) 185 (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH))
196 mode |= 2; 186 mode |= 2;
197 187
198 return (mode); 188 return (mode);
199#endif
200} 189}
201 190
202/* 191/*
203 * Prints out debug-information about a map. 192 * Prints out debug-information about a map.
204 * Dumping these at llevError doesn't seem right, but is 193 * Dumping these at llevError doesn't seem right, but is
… …
334 /* We basically go through the stack of objects, and if there is 323 /* We basically go through the stack of objects, and if there is
335 * some other object that has NO_PASS or FLAG_ALIVE set, return 324 * some other object that has NO_PASS or FLAG_ALIVE set, return
336 * true. If we get through the entire stack, that must mean 325 * true. If we get through the entire stack, that must mean
337 * ob is blocking it, so return 0. 326 * ob is blocking it, so return 0.
338 */ 327 */
339 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 328 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
340 { 329 {
341 330
342 /* This must be before the checks below. Code for inventory checkers. */ 331 /* This must be before the checks below. Code for inventory checkers. */
343 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 332 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
344 { 333 {
… …
408 * 397 *
409 * Note this used to be arch_blocked, but with new movement 398 * Note this used to be arch_blocked, but with new movement
410 * code, we need to have actual object to check its move_type 399 * code, we need to have actual object to check its move_type
411 * against the move_block values. 400 * against the move_block values.
412 */ 401 */
413
414int 402int
415ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 403ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
416{ 404{
417 archetype *tmp; 405 archetype *tmp;
418 int flag; 406 int flag;
… …
448 436
449 /* Note it is intentional that we check ob - the movement type of the 437 /* Note it is intentional that we check ob - the movement type of the
450 * head of the object should correspond for the entire object. 438 * head of the object should correspond for the entire object.
451 */ 439 */
452 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 440 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))
453 return AB_NO_PASS; 441 return P_NO_PASS;
454
455 } 442 }
443
456 return 0; 444 return 0;
457} 445}
458 446
459/* When the map is loaded, load_object does not actually insert objects 447/* When the map is loaded, load_object does not actually insert objects
460 * into inventory, but just links them. What this does is go through 448 * into inventory, but just links them. What this does is go through
… …
497 object *tmp, *op, *last, *above; 485 object *tmp, *op, *last, *above;
498 archetype *at; 486 archetype *at;
499 487
500 for (x = 0; x < MAP_WIDTH (m); x++) 488 for (x = 0; x < MAP_WIDTH (m); x++)
501 for (y = 0; y < MAP_HEIGHT (m); y++) 489 for (y = 0; y < MAP_HEIGHT (m); y++)
502 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
503 { 491 {
504 above = tmp->above; 492 above = tmp->above;
505 493
506 /* already multipart - don't do anything more */ 494 /* already multipart - don't do anything more */
507 if (tmp->head || tmp->more) 495 if (tmp->head || tmp->more)
… …
542{ 530{
543 int i, j; 531 int i, j;
544 int unique; 532 int unique;
545 object *op, *prev = NULL, *last_more = NULL, *otmp; 533 object *op, *prev = NULL, *last_more = NULL, *otmp;
546 534
547 op = get_object (); 535 op = object::create ();
548 op->map = m; /* To handle buttons correctly */ 536 op->map = m; /* To handle buttons correctly */
549 537
550 while ((i = load_object (fp, op, mapflags))) 538 while ((i = load_object (fp, op, mapflags)))
551 { 539 {
552 /* if the archetype for the object is null, means that we 540 /* if the archetype for the object is null, means that we
… …
560 } 548 }
561 549
562 550
563 switch (i) 551 switch (i)
564 { 552 {
565 case LL_NORMAL: 553 case LL_NORMAL:
566 /* if we are loading an overlay, put the floors on the bottom */ 554 /* if we are loading an overlay, put the floors on the bottom */
567 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) 555 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
568 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 556 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
569 else 557 else
570 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
571 559
572 if (op->inv) 560 if (op->inv)
573 sum_weight (op); 561 sum_weight (op);
574 562
575 prev = op, last_more = op; 563 prev = op, last_more = op;
576 break; 564 break;
577 565
578 case LL_MORE: 566 case LL_MORE:
579 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 567 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
580 op->head = prev, last_more->more = op, last_more = op; 568 op->head = prev, last_more->more = op, last_more = op;
581 break; 569 break;
582 } 570 }
583 571
584 if (mapflags & MAP_STYLE) 572 if (mapflags & MAP_STYLE)
585 remove_from_active_list (op); 573 remove_from_active_list (op);
586 574
587 op = get_object (); 575 op = object::create ();
588 op->map = m; 576 op->map = m;
589 } 577 }
590 578
591 for (i = 0; i < m->width; i++) 579 for (i = 0; i < m->width; i++)
592 { 580 {
593 for (j = 0; j < m->height; j++) 581 for (j = 0; j < m->height; j++)
594 { 582 {
595 unique = 0; 583 unique = 0;
596 /* check for unique items, or unique squares */ 584 /* check for unique items, or unique squares */
597 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 585 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
598 { 586 {
599 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 587 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
600 unique = 1; 588 unique = 1;
589
601 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
602 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 591 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
603 } 592 }
604 } 593 }
605 } 594 }
606 595
607 free_object (op); 596 op->destroy ();
608 link_multipart_objects (m); 597 link_multipart_objects (m);
609} 598}
610 599
611/* This saves all the objects on the map in a non destructive fashion. 600/* This saves all the objects on the map in a non destructive fashion.
612 * Modified by MSW 2001-07-01 to do in a single pass - reduces code, 601 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
… …
622 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
623 for (i = 0; i < MAP_WIDTH (m); i++) 612 for (i = 0; i < MAP_WIDTH (m); i++)
624 for (j = 0; j < MAP_HEIGHT (m); j++) 613 for (j = 0; j < MAP_HEIGHT (m); j++)
625 { 614 {
626 unique = 0; 615 unique = 0;
627 for (op = get_map_ob (m, i, j); op; op = op->above) 616 for (op = GET_MAP_OB (m, i, j); op; op = op->above)
628 { 617 {
629 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 618 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
630 unique = 1; 619 unique = 1;
631 620
632 if (op->type == PLAYER) 621 if (op->type == PLAYER)
633 {
634 LOG (llevDebug, "Player on map that is being saved\n");
635 continue; 622 continue;
636 }
637 623
638 if (op->head || op->owner) 624 if (op->head || op->owner)
639 continue; 625 continue;
640 626
641 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 627 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
642 save_object (fp2, op, 3); 628 save_object (fp2, op, 3);
643 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 629 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
644 save_object (fp, op, 3); 630 save_object (fp, op, 3);
631 }
632 }
633}
645 634
646 } /* for this space */ 635maptile::maptile ()
647 } /* for this j */ 636{
637 in_memory = MAP_SWAPPED;
638 /* The maps used to pick up default x and y values from the
639 * map archetype. Mimic that behaviour.
640 */
641 MAP_WIDTH (this) = 16;
642 MAP_HEIGHT (this) = 16;
643 MAP_RESET_TIMEOUT (this) = 0;
644 MAP_TIMEOUT (this) = 300;
645 MAP_ENTER_X (this) = 0;
646 MAP_ENTER_Y (this) = 0;
647 /*set part to -1 indicating conversion to weather map not yet done */
648 MAP_WORLDPARTX (this) = -1;
649 MAP_WORLDPARTY (this) = -1;
648} 650}
649 651
650/* 652/*
651 * Allocates, initialises, and returns a pointer to a maptile. 653 * Allocates, initialises, and returns a pointer to a maptile.
652 * Modified to no longer take a path option which was not being 654 * Modified to no longer take a path option which was not being
653 * used anyways. MSW 2001-07-01 655 * used anyways. MSW 2001-07-01
654 */ 656 */
655
656maptile * 657maptile *
657get_linked_map (void) 658get_linked_map (void)
658{ 659{
659 maptile *map = new maptile; 660 maptile *mp, *map = new maptile;
660 maptile *mp;
661 661
662 for (mp = first_map; mp != NULL && mp->next != NULL; mp = mp->next); 662 for (mp = first_map; mp && mp->next; mp = mp->next);
663
663 if (mp == NULL) 664 if (mp == NULL)
664 first_map = map; 665 first_map = map;
665 else 666 else
666 mp->next = map; 667 mp->next = map;
667 668
668 map->in_memory = MAP_SWAPPED;
669 /* The maps used to pick up default x and y values from the
670 * map archetype. Mimic that behaviour.
671 */
672 MAP_WIDTH (map) = 16;
673 MAP_HEIGHT (map) = 16;
674 MAP_RESET_TIMEOUT (map) = 0;
675 MAP_TIMEOUT (map) = 300;
676 MAP_ENTER_X (map) = 0;
677 MAP_ENTER_Y (map) = 0;
678 /*set part to -1 indicating conversion to weather map not yet done */
679 MAP_WORLDPARTX (map) = -1;
680 MAP_WORLDPARTY (map) = -1;
681 return map; 669 return map;
682} 670}
683 671
684/* 672/*
685 * Allocates the arrays contained in a maptile. 673 * Allocates the arrays contained in a maptile.
686 * This basically allocates the dynamic array of spaces for the 674 * This basically allocates the dynamic array of spaces for the
687 * map. 675 * map.
688 */ 676 */
689
690void 677void
691allocate_map (maptile *m) 678maptile::allocate ()
692{ 679{
693 m->in_memory = MAP_IN_MEMORY; 680 in_memory = MAP_IN_MEMORY;
681
694 /* Log this condition and free the storage. We could I suppose 682 /* Log this condition and free the storage. We could I suppose
695 * realloc, but if the caller is presuming the data will be intact, 683 * realloc, but if the caller is presuming the data will be intact,
696 * that is their poor assumption. 684 * that is their poor assumption.
697 */ 685 */
698 if (m->spaces) 686 if (spaces)
699 { 687 {
700 LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path); 688 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
701 free (m->spaces); 689 free (spaces);
702 } 690 }
703 691
704 m->spaces = (MapSpace *) calloc (1, MAP_WIDTH (m) * MAP_HEIGHT (m) * sizeof (MapSpace)); 692 spaces = (mapspace *)
693 calloc (1, width * height * sizeof (mapspace));
705 694
706 if (m->spaces == NULL) 695 if (!spaces)
707 fatal (OUT_OF_MEMORY); 696 fatal (OUT_OF_MEMORY);
708} 697}
709 698
710/* Create and returns a map of the specific size. Used 699/* Create and returns a map of the specific size. Used
711 * in random map code and the editor. 700 * in random map code and the editor.
… …
716 maptile *m = get_linked_map (); 705 maptile *m = get_linked_map ();
717 706
718 m->width = sizex; 707 m->width = sizex;
719 m->height = sizey; 708 m->height = sizey;
720 m->in_memory = MAP_SWAPPED; 709 m->in_memory = MAP_SWAPPED;
721 allocate_map (m); 710 m->allocate ();
711
722 return m; 712 return m;
723} 713}
724 714
725/* Takes a string from a map definition and outputs a pointer to the array of shopitems 715/* Takes a string from a map definition and outputs a pointer to the array of shopitems
726 * corresponding to that string. Memory is allocated for this, it must be freed 716 * corresponding to that string. Memory is allocated for this, it must be freed
… …
734 char *shop_string, *p, *q, *next_semicolon, *next_colon; 724 char *shop_string, *p, *q, *next_semicolon, *next_colon;
735 shopitems *items = NULL; 725 shopitems *items = NULL;
736 int i = 0, number_of_entries = 0; 726 int i = 0, number_of_entries = 0;
737 const typedata *current_type; 727 const typedata *current_type;
738 728
739 shop_string = strdup_local (input_string); 729 shop_string = strdup (input_string);
740 p = shop_string; 730 p = shop_string;
741 /* first we'll count the entries, we'll need that for allocating the array shortly */ 731 /* first we'll count the entries, we'll need that for allocating the array shortly */
742 while (p) 732 while (p)
743 { 733 {
744 p = strchr (p, ';'); 734 p = strchr (p, ';');
… …
853{ 843{
854 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 844 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
855 int msgpos = 0; 845 int msgpos = 0;
856 int maplorepos = 0; 846 int maplorepos = 0;
857 847
858 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 848 while (fgets (buf, HUGE_BUF, fp) != NULL)
859 { 849 {
860 buf[HUGE_BUF - 1] = 0; 850 buf[HUGE_BUF - 1] = 0;
861 key = buf; 851 key = buf;
852
862 while (isspace (*key)) 853 while (isspace (*key))
863 key++; 854 key++;
855
864 if (*key == 0) 856 if (*key == 0)
865 continue; /* empty line */ 857 continue; /* empty line */
858
866 value = strchr (key, ' '); 859 value = strchr (key, ' ');
860
867 if (!value) 861 if (!value)
868 { 862 {
869 end = strchr (key, '\n'); 863 if ((end = strchr (key, '\n')))
870 if (end != NULL)
871 {
872 *end = 0; 864 *end = 0;
873 }
874 } 865 }
875 else 866 else
876 { 867 {
877 *value = 0; 868 *value = 0;
878 value++; 869 value++;
879 end = strchr (value, '\n'); 870 end = strchr (value, '\n');
871
880 while (isspace (*value)) 872 while (isspace (*value))
881 { 873 {
882 value++; 874 value++;
875
883 if (*value == '\0' || value == end) 876 if (*value == '\0' || value == end)
884 { 877 {
885 /* Nothing but spaces. */ 878 /* Nothing but spaces. */
886 value = NULL; 879 value = NULL;
887 break; 880 break;
… …
910 * that use the parameter. 903 * that use the parameter.
911 */ 904 */
912 905
913 if (!strcmp (key, "msg")) 906 if (!strcmp (key, "msg"))
914 { 907 {
915 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 908 while (fgets (buf, HUGE_BUF, fp) != NULL)
916 { 909 {
917 if (!strcmp (buf, "endmsg\n")) 910 if (!strcmp (buf, "endmsg\n"))
918 break; 911 break;
919 else 912 else
920 { 913 {
… …
927 * with nothing between). There is no reason in those cases to 920 * with nothing between). There is no reason in those cases to
928 * keep the empty message. Also, msgbuf contains garbage data 921 * keep the empty message. Also, msgbuf contains garbage data
929 * when msgpos is zero, so copying it results in crashes 922 * when msgpos is zero, so copying it results in crashes
930 */ 923 */
931 if (msgpos != 0) 924 if (msgpos != 0)
932 m->msg = strdup_local (msgbuf); 925 m->msg = strdup (msgbuf);
933 } 926 }
934 else if (!strcmp (key, "maplore")) 927 else if (!strcmp (key, "maplore"))
935 { 928 {
936 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 929 while (fgets (buf, HUGE_BUF, fp) != NULL)
937 { 930 {
938 if (!strcmp (buf, "endmaplore\n")) 931 if (!strcmp (buf, "endmaplore\n"))
939 break; 932 break;
940 else 933 else
941 { 934 {
… …
943 strcpy (maplorebuf + maplorepos, buf); 936 strcpy (maplorebuf + maplorepos, buf);
944 maplorepos += strlen (buf); 937 maplorepos += strlen (buf);
945 } 938 }
946 } 939 }
947 if (maplorepos != 0) 940 if (maplorepos != 0)
948 m->maplore = strdup_local (maplorebuf); 941 m->maplore = strdup (maplorebuf);
949 } 942 }
950 else if (!strcmp (key, "end")) 943 else if (!strcmp (key, "end"))
951 { 944 {
952 break; 945 break;
953 } 946 }
… …
962 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 955 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
963 } 956 }
964 else if (!strcmp (key, "name")) 957 else if (!strcmp (key, "name"))
965 { 958 {
966 *end = 0; 959 *end = 0;
967 m->name = strdup_local (value); 960 m->name = strdup (value);
968 } 961 }
969 /* first strcmp value on these are old names supported 962 /* first strcmp value on these are old names supported
970 * for compatibility reasons. The new values (second) are 963 * for compatibility reasons. The new values (second) are
971 * what really should be used. 964 * what really should be used.
972 */ 965 */
973 else if (!strcmp (key, "oid")) 966 else if (!strcmp (key, "oid"))
974 {
975 fp.get (m, atoi (value)); 967 fp.get (m, atoi (value));
976 }
977 else if (!strcmp (key, "attach")) 968 else if (!strcmp (key, "attach"))
978 {
979 m->attach = value; 969 m->attach = value;
980 }
981 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 970 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
982 {
983 m->enter_x = atoi (value); 971 m->enter_x = atoi (value);
984 }
985 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 972 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
986 {
987 m->enter_y = atoi (value); 973 m->enter_y = atoi (value);
988 }
989 else if (!strcmp (key, "x") || !strcmp (key, "width")) 974 else if (!strcmp (key, "x") || !strcmp (key, "width"))
990 {
991 m->width = atoi (value); 975 m->width = atoi (value);
992 }
993 else if (!strcmp (key, "y") || !strcmp (key, "height")) 976 else if (!strcmp (key, "y") || !strcmp (key, "height"))
994 {
995 m->height = atoi (value); 977 m->height = atoi (value);
996 }
997 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 978 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
998 {
999 m->reset_timeout = atoi (value); 979 m->reset_timeout = atoi (value);
1000 }
1001 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 980 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1002 {
1003 m->timeout = atoi (value); 981 m->timeout = atoi (value);
1004 }
1005 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 982 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1006 { 983 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1007 m->difficulty = atoi (value);
1008 }
1009 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 984 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1010 {
1011 m->darkness = atoi (value); 985 m->darkness = atoi (value);
1012 }
1013 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 986 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1014 {
1015 m->fixed_resettime = atoi (value); 987 m->fixed_resettime = atoi (value);
1016 }
1017 else if (!strcmp (key, "unique")) 988 else if (!strcmp (key, "unique"))
1018 {
1019 m->unique = atoi (value); 989 m->unique = atoi (value);
1020 }
1021 else if (!strcmp (key, "template")) 990 else if (!strcmp (key, "template"))
1022 {
1023 m->templatemap = atoi (value); 991 m->templatemap = atoi (value);
1024 }
1025 else if (!strcmp (key, "region")) 992 else if (!strcmp (key, "region"))
1026 {
1027 m->region = get_region_by_name (value); 993 m->region = get_region_by_name (value);
1028 }
1029 else if (!strcmp (key, "shopitems")) 994 else if (!strcmp (key, "shopitems"))
1030 { 995 {
1031 *end = 0; 996 *end = 0;
1032 m->shopitems = parse_shop_string (value); 997 m->shopitems = parse_shop_string (value);
1033 } 998 }
1034 else if (!strcmp (key, "shopgreed")) 999 else if (!strcmp (key, "shopgreed"))
1035 {
1036 m->shopgreed = atof (value); 1000 m->shopgreed = atof (value);
1037 }
1038 else if (!strcmp (key, "shopmin")) 1001 else if (!strcmp (key, "shopmin"))
1039 {
1040 m->shopmin = atol (value); 1002 m->shopmin = atol (value);
1041 }
1042 else if (!strcmp (key, "shopmax")) 1003 else if (!strcmp (key, "shopmax"))
1043 {
1044 m->shopmax = atol (value); 1004 m->shopmax = atol (value);
1045 }
1046 else if (!strcmp (key, "shoprace")) 1005 else if (!strcmp (key, "shoprace"))
1047 { 1006 {
1048 *end = 0; 1007 *end = 0;
1049 m->shoprace = strdup_local (value); 1008 m->shoprace = strdup (value);
1050 } 1009 }
1051 else if (!strcmp (key, "outdoor")) 1010 else if (!strcmp (key, "outdoor"))
1052 {
1053 m->outdoor = atoi (value); 1011 m->outdoor = atoi (value);
1054 }
1055 else if (!strcmp (key, "temp")) 1012 else if (!strcmp (key, "temp"))
1056 {
1057 m->temp = atoi (value); 1013 m->temp = atoi (value);
1058 }
1059 else if (!strcmp (key, "pressure")) 1014 else if (!strcmp (key, "pressure"))
1060 {
1061 m->pressure = atoi (value); 1015 m->pressure = atoi (value);
1062 }
1063 else if (!strcmp (key, "humid")) 1016 else if (!strcmp (key, "humid"))
1064 {
1065 m->humid = atoi (value); 1017 m->humid = atoi (value);
1066 }
1067 else if (!strcmp (key, "windspeed")) 1018 else if (!strcmp (key, "windspeed"))
1068 {
1069 m->windspeed = atoi (value); 1019 m->windspeed = atoi (value);
1070 }
1071 else if (!strcmp (key, "winddir")) 1020 else if (!strcmp (key, "winddir"))
1072 {
1073 m->winddir = atoi (value); 1021 m->winddir = atoi (value);
1074 }
1075 else if (!strcmp (key, "sky")) 1022 else if (!strcmp (key, "sky"))
1076 {
1077 m->sky = atoi (value); 1023 m->sky = atoi (value);
1078 }
1079 else if (!strcmp (key, "nosmooth")) 1024 else if (!strcmp (key, "nosmooth"))
1080 {
1081 m->nosmooth = atoi (value); 1025 m->nosmooth = atoi (value);
1082 }
1083 else if (!strncmp (key, "tile_path_", 10)) 1026 else if (!strncmp (key, "tile_path_", 10))
1084 { 1027 {
1085 int tile = atoi (key + 10); 1028 int tile = atoi (key + 10);
1086 1029
1087 if (tile < 1 || tile > 4) 1030 if (tile < 1 || tile > 4)
… …
1120 } 1063 }
1121 1064
1122 if (editor) 1065 if (editor)
1123 { 1066 {
1124 /* Use the value as in the file. */ 1067 /* Use the value as in the file. */
1125 m->tile_path[tile - 1] = strdup_local (value); 1068 m->tile_path[tile - 1] = strdup (value);
1126 } 1069 }
1127 else if (path != NULL) 1070 else if (path != NULL)
1128 { 1071 {
1129 /* Use the normalized value. */ 1072 /* Use the normalized value. */
1130 m->tile_path[tile - 1] = strdup_local (path); 1073 m->tile_path[tile - 1] = strdup (path);
1131 } 1074 }
1132 } /* end if tile direction (in)valid */ 1075 } /* end if tile direction (in)valid */
1133 } 1076 }
1134 else 1077 else
1135 {
1136 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1078 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1137 }
1138 } 1079 }
1080
1139 if (!key || strcmp (key, "end")) 1081 if (!key || strcmp (key, "end"))
1140 { 1082 {
1141 LOG (llevError, "Got premature eof on map header!\n"); 1083 LOG (llevError, "Got premature eof on map header!\n");
1142 return 1; 1084 return 1;
1143 } 1085 }
1086
1144 return 0; 1087 return 0;
1145} 1088}
1146 1089
1147/* 1090/*
1148 * Opens the file "filename" and reads information about the map 1091 * Opens the file "filename" and reads information about the map
… …
1184 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1127 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1185 delete_map (m); 1128 delete_map (m);
1186 return NULL; 1129 return NULL;
1187 } 1130 }
1188 1131
1189 allocate_map (m); 1132 m->allocate ();
1190 1133
1191 m->in_memory = MAP_LOADING; 1134 m->in_memory = MAP_LOADING;
1192 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1135 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1193 1136
1194 m->in_memory = MAP_IN_MEMORY; 1137 m->in_memory = MAP_IN_MEMORY;
… …
1240 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname); 1183 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1241 delete_map (m); 1184 delete_map (m);
1242 m = load_original_map (m->path, 0); 1185 m = load_original_map (m->path, 0);
1243 return NULL; 1186 return NULL;
1244 } 1187 }
1188
1245 allocate_map (m); 1189 m->allocate ();
1246 1190
1247 m->in_memory = MAP_LOADING; 1191 m->in_memory = MAP_LOADING;
1248 load_objects (m, thawer, 0); 1192 load_objects (m, thawer, 0);
1249 1193
1250 m->in_memory = MAP_IN_MEMORY; 1194 m->in_memory = MAP_IN_MEMORY;
… …
1275 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1219 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1276 delete_map (m); 1220 delete_map (m);
1277 m = load_original_map (m->path, 0); 1221 m = load_original_map (m->path, 0);
1278 return NULL; 1222 return NULL;
1279 } 1223 }
1280 /*allocate_map(m); */ 1224 /*m->allocate ();*/
1281 1225
1282 m->in_memory = MAP_LOADING; 1226 m->in_memory = MAP_LOADING;
1283 load_objects (m, thawer, MAP_OVERLAY); 1227 load_objects (m, thawer, MAP_OVERLAY);
1284 1228
1285 m->in_memory = MAP_IN_MEMORY; 1229 m->in_memory = MAP_IN_MEMORY;
… …
1299 1243
1300 for (i = 0; i < MAP_WIDTH (m); i++) 1244 for (i = 0; i < MAP_WIDTH (m); i++)
1301 for (j = 0; j < MAP_HEIGHT (m); j++) 1245 for (j = 0; j < MAP_HEIGHT (m); j++)
1302 { 1246 {
1303 unique = 0; 1247 unique = 0;
1248
1304 for (op = get_map_ob (m, i, j); op; op = next) 1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1305 { 1250 {
1306 next = op->above; 1251 next = op->above;
1252
1307 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1253 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1308 unique = 1; 1254 unique = 1;
1255
1309 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1310 { 1257 {
1311 clean_object (op); 1258 clean_object (op);
1259
1312 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1260 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1313 remove_button_link (op); 1261 remove_button_link (op);
1314 remove_ob (op); 1262
1315 free_object (op); 1263 op->destroy ();
1316 } 1264 }
1317 } 1265 }
1318 } 1266 }
1319} 1267}
1320 1268
… …
1389 make_path_to_file (filename); 1337 make_path_to_file (filename);
1390 } 1338 }
1391 else 1339 else
1392 { 1340 {
1393 if (!m->tmpname) 1341 if (!m->tmpname)
1394 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1342 m->tmpname = tempnam (settings.tmpdir, NULL);
1395 1343
1396 strcpy (filename, m->tmpname); 1344 strcpy (filename, m->tmpname);
1397 } 1345 }
1398 1346
1399 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1347 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1423 print_shop_string (m, shop); 1371 print_shop_string (m, shop);
1424 fprintf (freezer, "shopitems %s\n", shop); 1372 fprintf (freezer, "shopitems %s\n", shop);
1425 } 1373 }
1426 if (m->shopgreed) 1374 if (m->shopgreed)
1427 fprintf (freezer, "shopgreed %f\n", m->shopgreed); 1375 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1428#ifndef WIN32
1429 if (m->shopmin) 1376 if (m->shopmin)
1430 fprintf (freezer, "shopmin %llu\n", m->shopmin); 1377 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1431 if (m->shopmax) 1378 if (m->shopmax)
1432 fprintf (freezer, "shopmax %llu\n", m->shopmax); 1379 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1433#else
1434 if (m->shopmin)
1435 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1436 if (m->shopmax)
1437 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1438#endif
1439 if (m->shoprace) 1380 if (m->shoprace)
1440 fprintf (freezer, "shoprace %s\n", m->shoprace); 1381 fprintf (freezer, "shoprace %s\n", m->shoprace);
1441 if (m->darkness) 1382 if (m->darkness)
1442 fprintf (freezer, "darkness %d\n", m->darkness); 1383 fprintf (freezer, "darkness %d\n", m->darkness);
1443 if (m->width) 1384 if (m->width)
… …
1522 object *tmp, *next; 1463 object *tmp, *next;
1523 1464
1524 for (tmp = op->inv; tmp; tmp = next) 1465 for (tmp = op->inv; tmp; tmp = next)
1525 { 1466 {
1526 next = tmp->below; 1467 next = tmp->below;
1468
1527 clean_object (tmp); 1469 clean_object (tmp);
1528 if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) 1470 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1529 remove_button_link (tmp); 1471 remove_button_link (tmp);
1530 remove_ob (tmp); 1472
1531 free_object (tmp); 1473 tmp->destroy ();
1532 } 1474 }
1533} 1475}
1534 1476
1535/* 1477/*
1536 * Remove and free all objects in the given map. 1478 * Remove and free all objects in the given map.
… …
1552 if (op == previous_obj) 1494 if (op == previous_obj)
1553 { 1495 {
1554 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); 1496 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1555 break; 1497 break;
1556 } 1498 }
1499
1557 previous_obj = op; 1500 previous_obj = op;
1501
1558 if (op->head != NULL) 1502 if (op->head != NULL)
1559 op = op->head; 1503 op = op->head;
1560 1504
1561 /* If the map isn't in memory, free_object will remove and 1505 /* If the map isn't in memory, free_object will remove and
1562 * free objects in op's inventory. So let it do the job. 1506 * free objects in op's inventory. So let it do the job.
1563 */ 1507 */
1564 if (m->in_memory == MAP_IN_MEMORY) 1508 if (m->in_memory == MAP_IN_MEMORY)
1565 clean_object (op); 1509 clean_object (op);
1566 remove_ob (op); 1510
1567 free_object (op); 1511 op->destroy ();
1568 } 1512 }
1569 } 1513 }
1570} 1514}
1571 1515
1572/* 1516/*
… …
1582 if (!m->in_memory) 1526 if (!m->in_memory)
1583 { 1527 {
1584 LOG (llevError, "Trying to free freed map.\n"); 1528 LOG (llevError, "Trying to free freed map.\n");
1585 return; 1529 return;
1586 } 1530 }
1531
1532 // TODO: use new/delete
1533#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1534
1587 if (flag && m->spaces) 1535 if (flag && m->spaces)
1588 free_all_objects (m); 1536 free_all_objects (m);
1589 if (m->name) 1537 if (m->name)
1590 FREE_AND_CLEAR (m->name); 1538 FREE_AND_CLEAR (m->name);
1591 if (m->spaces) 1539 if (m->spaces)
1592 FREE_AND_CLEAR (m->spaces); 1540 FREE_AND_CLEAR (m->spaces);
1593 if (m->msg) 1541 if (m->msg)
1594 FREE_AND_CLEAR (m->msg); 1542 FREE_AND_CLEAR (m->msg);
1595 if (m->maplore) 1543 if (m->maplore)
1596 FREE_AND_CLEAR (m->maplore); 1544 FREE_AND_CLEAR (m->maplore);
1597 if (m->shopitems) 1545
1598 delete[]m->shopitems; 1546 delete [] m->shopitems;
1599 m->shopitems = 0; 1547 m->shopitems = 0;
1548
1600 if (m->shoprace) 1549 if (m->shoprace)
1601 FREE_AND_CLEAR (m->shoprace); 1550 FREE_AND_CLEAR (m->shoprace);
1551
1602 if (m->buttons) 1552 if (m->buttons)
1603 free_objectlinkpt (m->buttons); 1553 free_objectlinkpt (m->buttons);
1554
1604 m->buttons = NULL; 1555 m->buttons = NULL;
1556
1605 for (i = 0; i < 4; i++) 1557 for (i = 0; i < 4; i++)
1606 { 1558 {
1607 if (m->tile_path[i]) 1559 if (m->tile_path[i])
1608 FREE_AND_CLEAR (m->tile_path[i]); 1560 FREE_AND_CLEAR (m->tile_path[i]);
1609 m->tile_map[i] = NULL; 1561 m->tile_map[i] = NULL;
1610 } 1562 }
1563
1611 m->in_memory = MAP_SWAPPED; 1564 m->in_memory = MAP_SWAPPED;
1565
1566#undef FREE_AND_CLEAR
1567
1612} 1568}
1613 1569
1614/* 1570/*
1615 * function: vanish maptile 1571 * function: vanish maptile
1616 * m : pointer to maptile, if NULL no action 1572 * m : pointer to maptile, if NULL no action
… …
1676 else 1632 else
1677 last->next = m->next; 1633 last->next = m->next;
1678 1634
1679 delete m; 1635 delete m;
1680} 1636}
1681
1682
1683 1637
1684/* 1638/*
1685 * Makes sure the given map is loaded and swapped in. 1639 * Makes sure the given map is loaded and swapped in.
1686 * name is path name of the map. 1640 * name is path name of the map.
1687 * flags meaning: 1641 * flags meaning:
… …
1690 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1644 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1691 * dont do any more name translation on it. 1645 * dont do any more name translation on it.
1692 * 1646 *
1693 * Returns a pointer to the given map. 1647 * Returns a pointer to the given map.
1694 */ 1648 */
1695
1696maptile * 1649maptile *
1697ready_map_name (const char *name, int flags) 1650ready_map_name (const char *name, int flags)
1698{ 1651{
1699 maptile *m; 1652 maptile *m;
1700 1653
… …
1823 return MAP_DIFFICULTY (m); 1776 return MAP_DIFFICULTY (m);
1824 } 1777 }
1825 1778
1826 for (x = 0; x < MAP_WIDTH (m); x++) 1779 for (x = 0; x < MAP_WIDTH (m); x++)
1827 for (y = 0; y < MAP_HEIGHT (m); y++) 1780 for (y = 0; y < MAP_HEIGHT (m); y++)
1828 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1781 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1829 { 1782 {
1830 if (QUERY_FLAG (op, FLAG_MONSTER)) 1783 if (QUERY_FLAG (op, FLAG_MONSTER))
1831 { 1784 {
1832 total_exp += op->stats.exp; 1785 total_exp += op->stats.exp;
1833 monster_cnt++; 1786 monster_cnt++;
… …
1926 /* All clients need to get re-updated for the change */ 1879 /* All clients need to get re-updated for the change */
1927 update_all_map_los (m); 1880 update_all_map_los (m);
1928 return 1; 1881 return 1;
1929} 1882}
1930 1883
1931
1932/* 1884/*
1933 * This function updates various attributes about a specific space 1885 * This function updates various attributes about a specific space
1934 * on the map (what it looks like, whether it blocks magic, 1886 * on the map (what it looks like, whether it blocks magic,
1935 * has a living creatures, prevents people from passing 1887 * has a living creatures, prevents people from passing
1936 * through, etc) 1888 * through, etc)
1937 */ 1889 */
1938void 1890void
1939update_position (maptile *m, int x, int y) 1891update_position (maptile *m, int x, int y)
1940{ 1892{
1941 object *tmp, *last = NULL; 1893 object *tmp, *last = 0;
1942 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1894 uint8 flags = 0, oldflags, light = 0, anywhere = 0;
1943 New_Face *top, *floor, *middle; 1895 New_Face *top, *floor, *middle;
1944 object *top_obj, *floor_obj, *middle_obj; 1896 object *top_obj, *floor_obj, *middle_obj;
1945 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1897 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1946 1898
… …
1950 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y); 1902 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1951 return; 1903 return;
1952 } 1904 }
1953 1905
1954 middle = blank_face; 1906 middle = blank_face;
1955 top = blank_face; 1907 top = blank_face;
1956 floor = blank_face; 1908 floor = blank_face;
1957 1909
1958 middle_obj = NULL; 1910 middle_obj = 0;
1959 top_obj = NULL; 1911 top_obj = 0;
1960 floor_obj = NULL; 1912 floor_obj = 0;
1961 1913
1962 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1914 for (tmp = GET_MAP_OB (m, x, y); tmp; last = tmp, tmp = tmp->above)
1963 { 1915 {
1964
1965 /* This could be made additive I guess (two lights better than 1916 /* This could be made additive I guess (two lights better than
1966 * one). But if so, it shouldn't be a simple additive - 2 1917 * one). But if so, it shouldn't be a simple additive - 2
1967 * light bulbs do not illuminate twice as far as once since 1918 * light bulbs do not illuminate twice as far as once since
1968 * it is a disapation factor that is squared (or is it cubed?) 1919 * it is a dissapation factor that is cubed.
1969 */ 1920 */
1970 if (tmp->glow_radius > light) 1921 if (tmp->glow_radius > light)
1971 light = tmp->glow_radius; 1922 light = tmp->glow_radius;
1972 1923
1973 /* This call is needed in order to update objects the player 1924 /* This call is needed in order to update objects the player
… …
2011 { 1962 {
2012 middle = tmp->face; 1963 middle = tmp->face;
2013 middle_obj = tmp; 1964 middle_obj = tmp;
2014 } 1965 }
2015 } 1966 }
1967
2016 if (tmp == tmp->above) 1968 if (tmp == tmp->above)
2017 { 1969 {
2018 LOG (llevError, "Error in structure of map\n"); 1970 LOG (llevError, "Error in structure of map\n");
2019 exit (-1); 1971 exit (-1);
2020 } 1972 }
2021 1973
2022 move_slow |= tmp->move_slow; 1974 move_slow |= tmp->move_slow;
2023 move_block |= tmp->move_block; 1975 move_block |= tmp->move_block;
2024 move_on |= tmp->move_on; 1976 move_on |= tmp->move_on;
2025 move_off |= tmp->move_off; 1977 move_off |= tmp->move_off;
2026 move_allow |= tmp->move_allow; 1978 move_allow |= tmp->move_allow;
2027 1979
2028 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2029 flags |= P_IS_ALIVE;
2030 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2031 flags |= P_NO_MAGIC;
2032 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2033 flags |= P_NO_CLERIC;
2034 if (tmp->type == SAFE_GROUND)
2035 flags |= P_SAFE;
2036
2037 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1980 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2038 flags |= P_BLOCKSVIEW; 1981 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2039 } /* for stack of objects */ 1982 if (tmp->type == PLAYER) flags |= P_PLAYER;
1983 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1984 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1985 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1986 }
2040 1987
2041 /* we don't want to rely on this function to have accurate flags, but 1988 /* we don't want to rely on this function to have accurate flags, but
2042 * since we're already doing the work, we calculate them here. 1989 * since we're already doing the work, we calculate them here.
2043 * if they don't match, logic is broken someplace. 1990 * if they don't match, logic is broken someplace.
2044 */ 1991 */
2045 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR))) 1992 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2046 {
2047 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1993 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n",
2048 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1994 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
2049 } 1995
2050 SET_MAP_FLAGS (m, x, y, flags); 1996 mapspace &s = m->at (x, y);
2051 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1997
2052 SET_MAP_MOVE_ON (m, x, y, move_on); 1998 s.flags = flags;
2053 SET_MAP_MOVE_OFF (m, x, y, move_off); 1999 s.move_block = move_block & ~move_allow;
2054 SET_MAP_MOVE_SLOW (m, x, y, move_slow); 2000 s.move_on = move_on;
2001 s.move_off = move_off;
2002 s.move_slow = move_slow;
2055 2003
2056 /* At this point, we have a floor face (if there is a floor), 2004 /* At this point, we have a floor face (if there is a floor),
2057 * and the floor is set - we are not going to touch it at 2005 * and the floor is set - we are not going to touch it at
2058 * this point. 2006 * this point.
2059 * middle contains the highest visibility face. 2007 * middle contains the highest visibility face.
… …
2113 break; 2061 break;
2114 } 2062 }
2115 } 2063 }
2116 } 2064 }
2117 } 2065 }
2066
2118 if (middle == floor) 2067 if (middle == floor)
2119 middle = blank_face; 2068 middle = blank_face;
2069
2120 if (top == middle) 2070 if (top == middle)
2121 middle = blank_face; 2071 middle = blank_face;
2072
2122 SET_MAP_FACE (m, x, y, top, 0); 2073 SET_MAP_FACE (m, x, y, top, 0);
2123 if (top != blank_face) 2074 if (top != blank_face)
2124 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); 2075 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2125 else 2076 else
2126 SET_MAP_FACE_OBJ (m, x, y, NULL, 0); 2077 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2078
2127 SET_MAP_FACE (m, x, y, middle, 1); 2079 SET_MAP_FACE (m, x, y, middle, 1);
2128 if (middle != blank_face) 2080 if (middle != blank_face)
2129 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1); 2081 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2130 else 2082 else
2131 SET_MAP_FACE_OBJ (m, x, y, NULL, 1); 2083 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2084
2132 SET_MAP_FACE (m, x, y, floor, 2); 2085 SET_MAP_FACE (m, x, y, floor, 2);
2133 if (floor != blank_face) 2086 if (floor != blank_face)
2134 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2); 2087 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2135 else 2088 else
2136 SET_MAP_FACE_OBJ (m, x, y, NULL, 2); 2089 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2090
2137 SET_MAP_LIGHT (m, x, y, light); 2091 SET_MAP_LIGHT (m, x, y, light);
2138} 2092}
2139 2093
2140 2094
2141void 2095void
… …
2146 timeout = MAP_RESET_TIMEOUT (map); 2100 timeout = MAP_RESET_TIMEOUT (map);
2147 if (timeout <= 0) 2101 if (timeout <= 0)
2148 timeout = MAP_DEFAULTRESET; 2102 timeout = MAP_DEFAULTRESET;
2149 if (timeout >= MAP_MAXRESET) 2103 if (timeout >= MAP_MAXRESET)
2150 timeout = MAP_MAXRESET; 2104 timeout = MAP_MAXRESET;
2151 MAP_WHEN_RESET (map) = seconds () + timeout; 2105 MAP_WHEN_RESET (map) = time (0) + timeout;
2152} 2106}
2153 2107
2154/* this updates the orig_map->tile_map[tile_num] value after loading 2108/* this updates the orig_map->tile_map[tile_num] value after loading
2155 * the map. It also takes care of linking back the freshly loaded 2109 * the map. It also takes care of linking back the freshly loaded
2156 * maps tile_map values if it tiles back to this one. It returns 2110 * maps tile_map values if it tiles back to this one. It returns

Diff Legend

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