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.34 by root, Sun Dec 3 02:04:57 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 32
36/* 33/*
37 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
38 * return NULL if no match is found. 35 * return NULL if no match is found.
39 */ 36 */
… …
157int 154int
158check_path (const char *name, int prepend_dir) 155check_path (const char *name, int prepend_dir)
159{ 156{
160 char buf[MAX_BUF]; 157 char buf[MAX_BUF];
161 158
162#ifndef WIN32
163 char *endbuf; 159 char *endbuf;
164 struct stat statbuf; 160 struct stat statbuf;
165 int mode = 0; 161 int mode = 0;
166#endif
167 162
168 if (prepend_dir) 163 if (prepend_dir)
169 strcpy (buf, create_pathname (name)); 164 strcpy (buf, create_pathname (name));
170 else 165 else
171 strcpy (buf, name); 166 strcpy (buf, name);
172#ifdef WIN32 /* ***win32: check this sucker in windows style. */
173 return (_access (buf, 0));
174#else
175 167
176 /* old method (strchr(buf, '\0')) seemd very odd to me - 168 /* old method (strchr(buf, '\0')) seemd very odd to me -
177 * this method should be equivalant and is clearer. 169 * this method should be equivalant and is clearer.
178 * Can not use strcat because we need to cycle through 170 * Can not use strcat because we need to cycle through
179 * all the names. 171 * all the names.
… …
192 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || 184 if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) ||
193 (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))
194 mode |= 2; 186 mode |= 2;
195 187
196 return (mode); 188 return (mode);
197#endif
198} 189}
199 190
200/* 191/*
201 * Prints out debug-information about a map. 192 * Prints out debug-information about a map.
202 * Dumping these at llevError doesn't seem right, but is 193 * Dumping these at llevError doesn't seem right, but is
… …
332 /* 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
333 * 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
334 * true. If we get through the entire stack, that must mean 325 * true. If we get through the entire stack, that must mean
335 * ob is blocking it, so return 0. 326 * ob is blocking it, so return 0.
336 */ 327 */
337 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)
338 { 329 {
339 330
340 /* This must be before the checks below. Code for inventory checkers. */ 331 /* This must be before the checks below. Code for inventory checkers. */
341 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 332 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
342 { 333 {
… …
406 * 397 *
407 * Note this used to be arch_blocked, but with new movement 398 * Note this used to be arch_blocked, but with new movement
408 * 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
409 * against the move_block values. 400 * against the move_block values.
410 */ 401 */
411
412int 402int
413ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 403ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
414{ 404{
415 archetype *tmp; 405 archetype *tmp;
416 int flag; 406 int flag;
… …
446 436
447 /* 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
448 * head of the object should correspond for the entire object. 438 * head of the object should correspond for the entire object.
449 */ 439 */
450 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)))
451 return AB_NO_PASS; 441 return P_NO_PASS;
452
453 } 442 }
443
454 return 0; 444 return 0;
455} 445}
456 446
457/* 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
458 * 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
… …
495 object *tmp, *op, *last, *above; 485 object *tmp, *op, *last, *above;
496 archetype *at; 486 archetype *at;
497 487
498 for (x = 0; x < MAP_WIDTH (m); x++) 488 for (x = 0; x < MAP_WIDTH (m); x++)
499 for (y = 0; y < MAP_HEIGHT (m); y++) 489 for (y = 0; y < MAP_HEIGHT (m); y++)
500 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)
501 { 491 {
502 above = tmp->above; 492 above = tmp->above;
503 493
504 /* already multipart - don't do anything more */ 494 /* already multipart - don't do anything more */
505 if (tmp->head || tmp->more) 495 if (tmp->head || tmp->more)
… …
540{ 530{
541 int i, j; 531 int i, j;
542 int unique; 532 int unique;
543 object *op, *prev = NULL, *last_more = NULL, *otmp; 533 object *op, *prev = NULL, *last_more = NULL, *otmp;
544 534
545 op = get_object (); 535 op = object::create ();
546 op->map = m; /* To handle buttons correctly */ 536 op->map = m; /* To handle buttons correctly */
547 537
548 while ((i = load_object (fp, op, mapflags))) 538 while ((i = load_object (fp, op, mapflags)))
549 { 539 {
550 /* if the archetype for the object is null, means that we 540 /* if the archetype for the object is null, means that we
… …
558 } 548 }
559 549
560 550
561 switch (i) 551 switch (i)
562 { 552 {
563 case LL_NORMAL: 553 case LL_NORMAL:
564 /* 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 */
565 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)
566 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);
567 else 557 else
568 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);
569 559
570 if (op->inv) 560 if (op->inv)
571 sum_weight (op); 561 sum_weight (op);
572 562
573 prev = op, last_more = op; 563 prev = op, last_more = op;
574 break; 564 break;
575 565
576 case LL_MORE: 566 case LL_MORE:
577 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);
578 op->head = prev, last_more->more = op, last_more = op; 568 op->head = prev, last_more->more = op, last_more = op;
579 break; 569 break;
580 } 570 }
581 571
582 if (mapflags & MAP_STYLE) 572 if (mapflags & MAP_STYLE)
583 remove_from_active_list (op); 573 remove_from_active_list (op);
584 574
585 op = get_object (); 575 op = object::create ();
586 op->map = m; 576 op->map = m;
587 } 577 }
588 578
589 for (i = 0; i < m->width; i++) 579 for (i = 0; i < m->width; i++)
590 { 580 {
591 for (j = 0; j < m->height; j++) 581 for (j = 0; j < m->height; j++)
592 { 582 {
593 unique = 0; 583 unique = 0;
594 /* check for unique items, or unique squares */ 584 /* check for unique items, or unique squares */
595 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)
596 { 586 {
597 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))
598 unique = 1; 588 unique = 1;
589
599 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 590 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
600 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 591 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
601 } 592 }
602 } 593 }
603 } 594 }
604 595
605 free_object (op); 596 op->destroy ();
606 link_multipart_objects (m); 597 link_multipart_objects (m);
607} 598}
608 599
609/* 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.
610 * 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,
… …
620 /* first pass - save one-part objects */ 611 /* first pass - save one-part objects */
621 for (i = 0; i < MAP_WIDTH (m); i++) 612 for (i = 0; i < MAP_WIDTH (m); i++)
622 for (j = 0; j < MAP_HEIGHT (m); j++) 613 for (j = 0; j < MAP_HEIGHT (m); j++)
623 { 614 {
624 unique = 0; 615 unique = 0;
625 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)
626 { 617 {
627 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))
628 unique = 1; 619 unique = 1;
629 620
630 if (op->type == PLAYER) 621 if (op->type == PLAYER)
631 {
632 LOG (llevDebug, "Player on map that is being saved\n");
633 continue; 622 continue;
634 }
635 623
636 if (op->head || op->owner) 624 if (op->head || op->owner)
637 continue; 625 continue;
638 626
639 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 627 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
640 save_object (fp2, op, 3); 628 save_object (fp2, op, 3);
641 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))))
642 save_object (fp, op, 3); 630 save_object (fp, op, 3);
643 631 }
644 } /* for this space */ 632 }
645 } /* for this j */
646} 633}
647 634
648maptile::maptile () 635maptile::maptile ()
649{ 636{
650 in_memory = MAP_SWAPPED; 637 in_memory = MAP_SWAPPED;
… …
700 { 687 {
701 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 688 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
702 free (spaces); 689 free (spaces);
703 } 690 }
704 691
705 spaces = (MapSpace *) 692 spaces = (mapspace *)
706 calloc (1, width * height * sizeof (MapSpace)); 693 calloc (1, width * height * sizeof (mapspace));
707 694
708 if (!spaces) 695 if (!spaces)
709 fatal (OUT_OF_MEMORY); 696 fatal (OUT_OF_MEMORY);
710} 697}
711 698
… …
737 char *shop_string, *p, *q, *next_semicolon, *next_colon; 724 char *shop_string, *p, *q, *next_semicolon, *next_colon;
738 shopitems *items = NULL; 725 shopitems *items = NULL;
739 int i = 0, number_of_entries = 0; 726 int i = 0, number_of_entries = 0;
740 const typedata *current_type; 727 const typedata *current_type;
741 728
742 shop_string = strdup_local (input_string); 729 shop_string = strdup (input_string);
743 p = shop_string; 730 p = shop_string;
744 /* 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 */
745 while (p) 732 while (p)
746 { 733 {
747 p = strchr (p, ';'); 734 p = strchr (p, ';');
… …
856{ 843{
857 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;
858 int msgpos = 0; 845 int msgpos = 0;
859 int maplorepos = 0; 846 int maplorepos = 0;
860 847
861 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 848 while (fgets (buf, HUGE_BUF, fp) != NULL)
862 { 849 {
863 buf[HUGE_BUF - 1] = 0; 850 buf[HUGE_BUF - 1] = 0;
864 key = buf; 851 key = buf;
852
865 while (isspace (*key)) 853 while (isspace (*key))
866 key++; 854 key++;
855
867 if (*key == 0) 856 if (*key == 0)
868 continue; /* empty line */ 857 continue; /* empty line */
858
869 value = strchr (key, ' '); 859 value = strchr (key, ' ');
860
870 if (!value) 861 if (!value)
871 { 862 {
872 end = strchr (key, '\n'); 863 if ((end = strchr (key, '\n')))
873 if (end != NULL)
874 {
875 *end = 0; 864 *end = 0;
876 }
877 } 865 }
878 else 866 else
879 { 867 {
880 *value = 0; 868 *value = 0;
881 value++; 869 value++;
882 end = strchr (value, '\n'); 870 end = strchr (value, '\n');
871
883 while (isspace (*value)) 872 while (isspace (*value))
884 { 873 {
885 value++; 874 value++;
875
886 if (*value == '\0' || value == end) 876 if (*value == '\0' || value == end)
887 { 877 {
888 /* Nothing but spaces. */ 878 /* Nothing but spaces. */
889 value = NULL; 879 value = NULL;
890 break; 880 break;
… …
913 * that use the parameter. 903 * that use the parameter.
914 */ 904 */
915 905
916 if (!strcmp (key, "msg")) 906 if (!strcmp (key, "msg"))
917 { 907 {
918 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 908 while (fgets (buf, HUGE_BUF, fp) != NULL)
919 { 909 {
920 if (!strcmp (buf, "endmsg\n")) 910 if (!strcmp (buf, "endmsg\n"))
921 break; 911 break;
922 else 912 else
923 { 913 {
… …
930 * with nothing between). There is no reason in those cases to 920 * with nothing between). There is no reason in those cases to
931 * keep the empty message. Also, msgbuf contains garbage data 921 * keep the empty message. Also, msgbuf contains garbage data
932 * when msgpos is zero, so copying it results in crashes 922 * when msgpos is zero, so copying it results in crashes
933 */ 923 */
934 if (msgpos != 0) 924 if (msgpos != 0)
935 m->msg = strdup_local (msgbuf); 925 m->msg = strdup (msgbuf);
936 } 926 }
937 else if (!strcmp (key, "maplore")) 927 else if (!strcmp (key, "maplore"))
938 { 928 {
939 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 929 while (fgets (buf, HUGE_BUF, fp) != NULL)
940 { 930 {
941 if (!strcmp (buf, "endmaplore\n")) 931 if (!strcmp (buf, "endmaplore\n"))
942 break; 932 break;
943 else 933 else
944 { 934 {
… …
946 strcpy (maplorebuf + maplorepos, buf); 936 strcpy (maplorebuf + maplorepos, buf);
947 maplorepos += strlen (buf); 937 maplorepos += strlen (buf);
948 } 938 }
949 } 939 }
950 if (maplorepos != 0) 940 if (maplorepos != 0)
951 m->maplore = strdup_local (maplorebuf); 941 m->maplore = strdup (maplorebuf);
952 } 942 }
953 else if (!strcmp (key, "end")) 943 else if (!strcmp (key, "end"))
954 { 944 {
955 break; 945 break;
956 } 946 }
… …
965 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);
966 } 956 }
967 else if (!strcmp (key, "name")) 957 else if (!strcmp (key, "name"))
968 { 958 {
969 *end = 0; 959 *end = 0;
970 m->name = strdup_local (value); 960 m->name = strdup (value);
971 } 961 }
972 /* first strcmp value on these are old names supported 962 /* first strcmp value on these are old names supported
973 * for compatibility reasons. The new values (second) are 963 * for compatibility reasons. The new values (second) are
974 * what really should be used. 964 * what really should be used.
975 */ 965 */
976 else if (!strcmp (key, "oid")) 966 else if (!strcmp (key, "oid"))
977 {
978 fp.get (m, atoi (value)); 967 fp.get (m, atoi (value));
979 }
980 else if (!strcmp (key, "attach")) 968 else if (!strcmp (key, "attach"))
981 {
982 m->attach = value; 969 m->attach = value;
983 }
984 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 970 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
985 {
986 m->enter_x = atoi (value); 971 m->enter_x = atoi (value);
987 }
988 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 972 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
989 {
990 m->enter_y = atoi (value); 973 m->enter_y = atoi (value);
991 }
992 else if (!strcmp (key, "x") || !strcmp (key, "width")) 974 else if (!strcmp (key, "x") || !strcmp (key, "width"))
993 {
994 m->width = atoi (value); 975 m->width = atoi (value);
995 }
996 else if (!strcmp (key, "y") || !strcmp (key, "height")) 976 else if (!strcmp (key, "y") || !strcmp (key, "height"))
997 {
998 m->height = atoi (value); 977 m->height = atoi (value);
999 }
1000 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 978 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1001 {
1002 m->reset_timeout = atoi (value); 979 m->reset_timeout = atoi (value);
1003 }
1004 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 980 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1005 {
1006 m->timeout = atoi (value); 981 m->timeout = atoi (value);
1007 }
1008 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 982 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1009 { 983 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1010 m->difficulty = atoi (value);
1011 }
1012 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 984 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1013 {
1014 m->darkness = atoi (value); 985 m->darkness = atoi (value);
1015 }
1016 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 986 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1017 {
1018 m->fixed_resettime = atoi (value); 987 m->fixed_resettime = atoi (value);
1019 }
1020 else if (!strcmp (key, "unique")) 988 else if (!strcmp (key, "unique"))
1021 {
1022 m->unique = atoi (value); 989 m->unique = atoi (value);
1023 }
1024 else if (!strcmp (key, "template")) 990 else if (!strcmp (key, "template"))
1025 {
1026 m->templatemap = atoi (value); 991 m->templatemap = atoi (value);
1027 }
1028 else if (!strcmp (key, "region")) 992 else if (!strcmp (key, "region"))
1029 {
1030 m->region = get_region_by_name (value); 993 m->region = get_region_by_name (value);
1031 }
1032 else if (!strcmp (key, "shopitems")) 994 else if (!strcmp (key, "shopitems"))
1033 { 995 {
1034 *end = 0; 996 *end = 0;
1035 m->shopitems = parse_shop_string (value); 997 m->shopitems = parse_shop_string (value);
1036 } 998 }
1037 else if (!strcmp (key, "shopgreed")) 999 else if (!strcmp (key, "shopgreed"))
1038 {
1039 m->shopgreed = atof (value); 1000 m->shopgreed = atof (value);
1040 }
1041 else if (!strcmp (key, "shopmin")) 1001 else if (!strcmp (key, "shopmin"))
1042 {
1043 m->shopmin = atol (value); 1002 m->shopmin = atol (value);
1044 }
1045 else if (!strcmp (key, "shopmax")) 1003 else if (!strcmp (key, "shopmax"))
1046 {
1047 m->shopmax = atol (value); 1004 m->shopmax = atol (value);
1048 }
1049 else if (!strcmp (key, "shoprace")) 1005 else if (!strcmp (key, "shoprace"))
1050 { 1006 {
1051 *end = 0; 1007 *end = 0;
1052 m->shoprace = strdup_local (value); 1008 m->shoprace = strdup (value);
1053 } 1009 }
1054 else if (!strcmp (key, "outdoor")) 1010 else if (!strcmp (key, "outdoor"))
1055 {
1056 m->outdoor = atoi (value); 1011 m->outdoor = atoi (value);
1057 }
1058 else if (!strcmp (key, "temp")) 1012 else if (!strcmp (key, "temp"))
1059 {
1060 m->temp = atoi (value); 1013 m->temp = atoi (value);
1061 }
1062 else if (!strcmp (key, "pressure")) 1014 else if (!strcmp (key, "pressure"))
1063 {
1064 m->pressure = atoi (value); 1015 m->pressure = atoi (value);
1065 }
1066 else if (!strcmp (key, "humid")) 1016 else if (!strcmp (key, "humid"))
1067 {
1068 m->humid = atoi (value); 1017 m->humid = atoi (value);
1069 }
1070 else if (!strcmp (key, "windspeed")) 1018 else if (!strcmp (key, "windspeed"))
1071 {
1072 m->windspeed = atoi (value); 1019 m->windspeed = atoi (value);
1073 }
1074 else if (!strcmp (key, "winddir")) 1020 else if (!strcmp (key, "winddir"))
1075 {
1076 m->winddir = atoi (value); 1021 m->winddir = atoi (value);
1077 }
1078 else if (!strcmp (key, "sky")) 1022 else if (!strcmp (key, "sky"))
1079 {
1080 m->sky = atoi (value); 1023 m->sky = atoi (value);
1081 }
1082 else if (!strcmp (key, "nosmooth")) 1024 else if (!strcmp (key, "nosmooth"))
1083 {
1084 m->nosmooth = atoi (value); 1025 m->nosmooth = atoi (value);
1085 }
1086 else if (!strncmp (key, "tile_path_", 10)) 1026 else if (!strncmp (key, "tile_path_", 10))
1087 { 1027 {
1088 int tile = atoi (key + 10); 1028 int tile = atoi (key + 10);
1089 1029
1090 if (tile < 1 || tile > 4) 1030 if (tile < 1 || tile > 4)
… …
1123 } 1063 }
1124 1064
1125 if (editor) 1065 if (editor)
1126 { 1066 {
1127 /* Use the value as in the file. */ 1067 /* Use the value as in the file. */
1128 m->tile_path[tile - 1] = strdup_local (value); 1068 m->tile_path[tile - 1] = strdup (value);
1129 } 1069 }
1130 else if (path != NULL) 1070 else if (path != NULL)
1131 { 1071 {
1132 /* Use the normalized value. */ 1072 /* Use the normalized value. */
1133 m->tile_path[tile - 1] = strdup_local (path); 1073 m->tile_path[tile - 1] = strdup (path);
1134 } 1074 }
1135 } /* end if tile direction (in)valid */ 1075 } /* end if tile direction (in)valid */
1136 } 1076 }
1137 else 1077 else
1138 {
1139 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);
1140 }
1141 } 1079 }
1080
1142 if (!key || strcmp (key, "end")) 1081 if (!key || strcmp (key, "end"))
1143 { 1082 {
1144 LOG (llevError, "Got premature eof on map header!\n"); 1083 LOG (llevError, "Got premature eof on map header!\n");
1145 return 1; 1084 return 1;
1146 } 1085 }
1086
1147 return 0; 1087 return 0;
1148} 1088}
1149 1089
1150/* 1090/*
1151 * Opens the file "filename" and reads information about the map 1091 * Opens the file "filename" and reads information about the map
… …
1303 1243
1304 for (i = 0; i < MAP_WIDTH (m); i++) 1244 for (i = 0; i < MAP_WIDTH (m); i++)
1305 for (j = 0; j < MAP_HEIGHT (m); j++) 1245 for (j = 0; j < MAP_HEIGHT (m); j++)
1306 { 1246 {
1307 unique = 0; 1247 unique = 0;
1248
1308 for (op = get_map_ob (m, i, j); op; op = next) 1249 for (op = GET_MAP_OB (m, i, j); op; op = next)
1309 { 1250 {
1310 next = op->above; 1251 next = op->above;
1252
1311 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))
1312 unique = 1; 1254 unique = 1;
1255
1313 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1256 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1314 { 1257 {
1315 clean_object (op); 1258 clean_object (op);
1259
1316 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1260 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1317 remove_button_link (op); 1261 remove_button_link (op);
1318 remove_ob (op); 1262
1319 free_object (op); 1263 op->destroy ();
1320 } 1264 }
1321 } 1265 }
1322 } 1266 }
1323} 1267}
1324 1268
… …
1393 make_path_to_file (filename); 1337 make_path_to_file (filename);
1394 } 1338 }
1395 else 1339 else
1396 { 1340 {
1397 if (!m->tmpname) 1341 if (!m->tmpname)
1398 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1342 m->tmpname = tempnam (settings.tmpdir, NULL);
1399 1343
1400 strcpy (filename, m->tmpname); 1344 strcpy (filename, m->tmpname);
1401 } 1345 }
1402 1346
1403 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1347 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1427 print_shop_string (m, shop); 1371 print_shop_string (m, shop);
1428 fprintf (freezer, "shopitems %s\n", shop); 1372 fprintf (freezer, "shopitems %s\n", shop);
1429 } 1373 }
1430 if (m->shopgreed) 1374 if (m->shopgreed)
1431 fprintf (freezer, "shopgreed %f\n", m->shopgreed); 1375 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1432#ifndef WIN32
1433 if (m->shopmin) 1376 if (m->shopmin)
1434 fprintf (freezer, "shopmin %llu\n", m->shopmin); 1377 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1435 if (m->shopmax) 1378 if (m->shopmax)
1436 fprintf (freezer, "shopmax %llu\n", m->shopmax); 1379 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1437#else
1438 if (m->shopmin)
1439 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1440 if (m->shopmax)
1441 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1442#endif
1443 if (m->shoprace) 1380 if (m->shoprace)
1444 fprintf (freezer, "shoprace %s\n", m->shoprace); 1381 fprintf (freezer, "shoprace %s\n", m->shoprace);
1445 if (m->darkness) 1382 if (m->darkness)
1446 fprintf (freezer, "darkness %d\n", m->darkness); 1383 fprintf (freezer, "darkness %d\n", m->darkness);
1447 if (m->width) 1384 if (m->width)
… …
1526 object *tmp, *next; 1463 object *tmp, *next;
1527 1464
1528 for (tmp = op->inv; tmp; tmp = next) 1465 for (tmp = op->inv; tmp; tmp = next)
1529 { 1466 {
1530 next = tmp->below; 1467 next = tmp->below;
1468
1531 clean_object (tmp); 1469 clean_object (tmp);
1532 if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) 1470 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1533 remove_button_link (tmp); 1471 remove_button_link (tmp);
1534 remove_ob (tmp); 1472
1535 free_object (tmp); 1473 tmp->destroy ();
1536 } 1474 }
1537} 1475}
1538 1476
1539/* 1477/*
1540 * Remove and free all objects in the given map. 1478 * Remove and free all objects in the given map.
… …
1556 if (op == previous_obj) 1494 if (op == previous_obj)
1557 { 1495 {
1558 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); 1496 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1559 break; 1497 break;
1560 } 1498 }
1499
1561 previous_obj = op; 1500 previous_obj = op;
1501
1562 if (op->head != NULL) 1502 if (op->head != NULL)
1563 op = op->head; 1503 op = op->head;
1564 1504
1565 /* 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
1566 * 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.
1567 */ 1507 */
1568 if (m->in_memory == MAP_IN_MEMORY) 1508 if (m->in_memory == MAP_IN_MEMORY)
1569 clean_object (op); 1509 clean_object (op);
1570 remove_ob (op); 1510
1571 free_object (op); 1511 op->destroy ();
1572 } 1512 }
1573 } 1513 }
1574} 1514}
1575 1515
1576/* 1516/*
… …
1586 if (!m->in_memory) 1526 if (!m->in_memory)
1587 { 1527 {
1588 LOG (llevError, "Trying to free freed map.\n"); 1528 LOG (llevError, "Trying to free freed map.\n");
1589 return; 1529 return;
1590 } 1530 }
1531
1532 // TODO: use new/delete
1533#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1534
1591 if (flag && m->spaces) 1535 if (flag && m->spaces)
1592 free_all_objects (m); 1536 free_all_objects (m);
1593 if (m->name) 1537 if (m->name)
1594 FREE_AND_CLEAR (m->name); 1538 FREE_AND_CLEAR (m->name);
1595 if (m->spaces) 1539 if (m->spaces)
1596 FREE_AND_CLEAR (m->spaces); 1540 FREE_AND_CLEAR (m->spaces);
1597 if (m->msg) 1541 if (m->msg)
1598 FREE_AND_CLEAR (m->msg); 1542 FREE_AND_CLEAR (m->msg);
1599 if (m->maplore) 1543 if (m->maplore)
1600 FREE_AND_CLEAR (m->maplore); 1544 FREE_AND_CLEAR (m->maplore);
1601 if (m->shopitems) 1545
1602 delete[]m->shopitems; 1546 delete [] m->shopitems;
1603 m->shopitems = 0; 1547 m->shopitems = 0;
1548
1604 if (m->shoprace) 1549 if (m->shoprace)
1605 FREE_AND_CLEAR (m->shoprace); 1550 FREE_AND_CLEAR (m->shoprace);
1551
1606 if (m->buttons) 1552 if (m->buttons)
1607 free_objectlinkpt (m->buttons); 1553 free_objectlinkpt (m->buttons);
1554
1608 m->buttons = NULL; 1555 m->buttons = NULL;
1556
1609 for (i = 0; i < 4; i++) 1557 for (i = 0; i < 4; i++)
1610 { 1558 {
1611 if (m->tile_path[i]) 1559 if (m->tile_path[i])
1612 FREE_AND_CLEAR (m->tile_path[i]); 1560 FREE_AND_CLEAR (m->tile_path[i]);
1613 m->tile_map[i] = NULL; 1561 m->tile_map[i] = NULL;
1614 } 1562 }
1563
1615 m->in_memory = MAP_SWAPPED; 1564 m->in_memory = MAP_SWAPPED;
1565
1566#undef FREE_AND_CLEAR
1567
1616} 1568}
1617 1569
1618/* 1570/*
1619 * function: vanish maptile 1571 * function: vanish maptile
1620 * m : pointer to maptile, if NULL no action 1572 * m : pointer to maptile, if NULL no action
… …
1680 else 1632 else
1681 last->next = m->next; 1633 last->next = m->next;
1682 1634
1683 delete m; 1635 delete m;
1684} 1636}
1685
1686
1687 1637
1688/* 1638/*
1689 * Makes sure the given map is loaded and swapped in. 1639 * Makes sure the given map is loaded and swapped in.
1690 * name is path name of the map. 1640 * name is path name of the map.
1691 * flags meaning: 1641 * flags meaning:
… …
1694 * 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.
1695 * dont do any more name translation on it. 1645 * dont do any more name translation on it.
1696 * 1646 *
1697 * Returns a pointer to the given map. 1647 * Returns a pointer to the given map.
1698 */ 1648 */
1699
1700maptile * 1649maptile *
1701ready_map_name (const char *name, int flags) 1650ready_map_name (const char *name, int flags)
1702{ 1651{
1703 maptile *m; 1652 maptile *m;
1704 1653
… …
1827 return MAP_DIFFICULTY (m); 1776 return MAP_DIFFICULTY (m);
1828 } 1777 }
1829 1778
1830 for (x = 0; x < MAP_WIDTH (m); x++) 1779 for (x = 0; x < MAP_WIDTH (m); x++)
1831 for (y = 0; y < MAP_HEIGHT (m); y++) 1780 for (y = 0; y < MAP_HEIGHT (m); y++)
1832 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)
1833 { 1782 {
1834 if (QUERY_FLAG (op, FLAG_MONSTER)) 1783 if (QUERY_FLAG (op, FLAG_MONSTER))
1835 { 1784 {
1836 total_exp += op->stats.exp; 1785 total_exp += op->stats.exp;
1837 monster_cnt++; 1786 monster_cnt++;
… …
1930 /* All clients need to get re-updated for the change */ 1879 /* All clients need to get re-updated for the change */
1931 update_all_map_los (m); 1880 update_all_map_los (m);
1932 return 1; 1881 return 1;
1933} 1882}
1934 1883
1935
1936/* 1884/*
1937 * This function updates various attributes about a specific space 1885 * This function updates various attributes about a specific space
1938 * on the map (what it looks like, whether it blocks magic, 1886 * on the map (what it looks like, whether it blocks magic,
1939 * has a living creatures, prevents people from passing 1887 * has a living creatures, prevents people from passing
1940 * through, etc) 1888 * through, etc)
1941 */ 1889 */
1942void 1890void
1943update_position (maptile *m, int x, int y) 1891update_position (maptile *m, int x, int y)
1944{ 1892{
1945 object *tmp, *last = NULL; 1893 object *tmp, *last = 0;
1946 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1894 uint8 flags = 0, oldflags, light = 0, anywhere = 0;
1947 New_Face *top, *floor, *middle; 1895 New_Face *top, *floor, *middle;
1948 object *top_obj, *floor_obj, *middle_obj; 1896 object *top_obj, *floor_obj, *middle_obj;
1949 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;
1950 1898
… …
1954 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);
1955 return; 1903 return;
1956 } 1904 }
1957 1905
1958 middle = blank_face; 1906 middle = blank_face;
1959 top = blank_face; 1907 top = blank_face;
1960 floor = blank_face; 1908 floor = blank_face;
1961 1909
1962 middle_obj = NULL; 1910 middle_obj = 0;
1963 top_obj = NULL; 1911 top_obj = 0;
1964 floor_obj = NULL; 1912 floor_obj = 0;
1965 1913
1966 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)
1967 { 1915 {
1968
1969 /* This could be made additive I guess (two lights better than 1916 /* This could be made additive I guess (two lights better than
1970 * 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
1971 * light bulbs do not illuminate twice as far as once since 1918 * light bulbs do not illuminate twice as far as once since
1972 * it is a disapation factor that is squared (or is it cubed?) 1919 * it is a dissapation factor that is cubed.
1973 */ 1920 */
1974 if (tmp->glow_radius > light) 1921 if (tmp->glow_radius > light)
1975 light = tmp->glow_radius; 1922 light = tmp->glow_radius;
1976 1923
1977 /* This call is needed in order to update objects the player 1924 /* This call is needed in order to update objects the player
… …
2015 { 1962 {
2016 middle = tmp->face; 1963 middle = tmp->face;
2017 middle_obj = tmp; 1964 middle_obj = tmp;
2018 } 1965 }
2019 } 1966 }
1967
2020 if (tmp == tmp->above) 1968 if (tmp == tmp->above)
2021 { 1969 {
2022 LOG (llevError, "Error in structure of map\n"); 1970 LOG (llevError, "Error in structure of map\n");
2023 exit (-1); 1971 exit (-1);
2024 } 1972 }
2025 1973
2026 move_slow |= tmp->move_slow; 1974 move_slow |= tmp->move_slow;
2027 move_block |= tmp->move_block; 1975 move_block |= tmp->move_block;
2028 move_on |= tmp->move_on; 1976 move_on |= tmp->move_on;
2029 move_off |= tmp->move_off; 1977 move_off |= tmp->move_off;
2030 move_allow |= tmp->move_allow; 1978 move_allow |= tmp->move_allow;
2031 1979
2032 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2033 flags |= P_IS_ALIVE;
2034 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2035 flags |= P_NO_MAGIC;
2036 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2037 flags |= P_NO_CLERIC;
2038 if (tmp->type == SAFE_GROUND)
2039 flags |= P_SAFE;
2040
2041 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1980 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2042 flags |= P_BLOCKSVIEW; 1981 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2043 } /* 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 }
2044 1987
2045 /* 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
2046 * since we're already doing the work, we calculate them here. 1989 * since we're already doing the work, we calculate them here.
2047 * if they don't match, logic is broken someplace. 1990 * if they don't match, logic is broken someplace.
2048 */ 1991 */
2049 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)))
2050 {
2051 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",
2052 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1994 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags);
2053 } 1995
2054 SET_MAP_FLAGS (m, x, y, flags); 1996 mapspace &s = m->at (x, y);
2055 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1997
2056 SET_MAP_MOVE_ON (m, x, y, move_on); 1998 s.flags = flags;
2057 SET_MAP_MOVE_OFF (m, x, y, move_off); 1999 s.move_block = move_block & ~move_allow;
2058 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;
2059 2003
2060 /* 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),
2061 * 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
2062 * this point. 2006 * this point.
2063 * middle contains the highest visibility face. 2007 * middle contains the highest visibility face.
… …
2117 break; 2061 break;
2118 } 2062 }
2119 } 2063 }
2120 } 2064 }
2121 } 2065 }
2066
2122 if (middle == floor) 2067 if (middle == floor)
2123 middle = blank_face; 2068 middle = blank_face;
2069
2124 if (top == middle) 2070 if (top == middle)
2125 middle = blank_face; 2071 middle = blank_face;
2072
2126 SET_MAP_FACE (m, x, y, top, 0); 2073 SET_MAP_FACE (m, x, y, top, 0);
2127 if (top != blank_face) 2074 if (top != blank_face)
2128 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); 2075 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2129 else 2076 else
2130 SET_MAP_FACE_OBJ (m, x, y, NULL, 0); 2077 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2078
2131 SET_MAP_FACE (m, x, y, middle, 1); 2079 SET_MAP_FACE (m, x, y, middle, 1);
2132 if (middle != blank_face) 2080 if (middle != blank_face)
2133 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1); 2081 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2134 else 2082 else
2135 SET_MAP_FACE_OBJ (m, x, y, NULL, 1); 2083 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2084
2136 SET_MAP_FACE (m, x, y, floor, 2); 2085 SET_MAP_FACE (m, x, y, floor, 2);
2137 if (floor != blank_face) 2086 if (floor != blank_face)
2138 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2); 2087 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2139 else 2088 else
2140 SET_MAP_FACE_OBJ (m, x, y, NULL, 2); 2089 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2090
2141 SET_MAP_LIGHT (m, x, y, light); 2091 SET_MAP_LIGHT (m, x, y, light);
2142} 2092}
2143 2093
2144 2094
2145void 2095void
… …
2150 timeout = MAP_RESET_TIMEOUT (map); 2100 timeout = MAP_RESET_TIMEOUT (map);
2151 if (timeout <= 0) 2101 if (timeout <= 0)
2152 timeout = MAP_DEFAULTRESET; 2102 timeout = MAP_DEFAULTRESET;
2153 if (timeout >= MAP_MAXRESET) 2103 if (timeout >= MAP_MAXRESET)
2154 timeout = MAP_MAXRESET; 2104 timeout = MAP_MAXRESET;
2155 MAP_WHEN_RESET (map) = seconds () + timeout; 2105 MAP_WHEN_RESET (map) = time (0) + timeout;
2156} 2106}
2157 2107
2158/* 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
2159 * 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
2160 * 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