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.40 by root, Tue Dec 12 21:39:56 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 2006 UTC

… …
27 27
28#include <loader.h> 28#include <loader.h>
29#include <unistd.h> 29#include <unistd.h>
30 30
31#include "path.h" 31#include "path.h"
32
33 32
34/* 33/*
35 * Returns the maptile which has a name matching the given argument. 34 * Returns the maptile which has a name matching the given argument.
36 * return NULL if no match is found. 35 * return NULL if no match is found.
37 */ 36 */
… …
223void 222void
224dump_all_maps (void) 223dump_all_maps (void)
225{ 224{
226 maptile *m; 225 maptile *m;
227 226
228 for (m = first_map; m != NULL; m = m->next) 227 for (m = first_map; m; m = m->next)
229 {
230 dump_map (m); 228 dump_map (m);
231 }
232} 229}
233 230
234/* This rolls up wall, blocks_magic, blocks_view, etc, all into 231/* This rolls up wall, blocks_magic, blocks_view, etc, all into
235 * one function that just returns a P_.. value (see map.h) 232 * one function that just returns a P_.. value (see map.h)
236 * it will also do map translation for tiled maps, returning 233 * it will also do map translation for tiled maps, returning
… …
240 * is needed. The case of not passing values is if we're just 237 * is needed. The case of not passing values is if we're just
241 * checking for the existence of something on those spaces, but 238 * checking for the existence of something on those spaces, but
242 * don't expect to insert/remove anything from those spaces. 239 * don't expect to insert/remove anything from those spaces.
243 */ 240 */
244int 241int
245get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) 242get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny)
246{ 243{
247 sint16 newx, newy; 244 sint16 newx, newy;
248 int retval = 0; 245 int retval = 0;
249 maptile *mp; 246 maptile *mp;
250 247
251 if (out_of_map (oldmap, x, y))
252 return P_OUT_OF_MAP;
253 newx = x; 248 newx = x;
254 newy = y; 249 newy = y;
250
255 mp = get_map_from_coord (oldmap, &newx, &newy); 251 mp = get_map_from_coord (oldmap, &newx, &newy);
252
253 if (!mp)
254 return P_OUT_OF_MAP;
255
256 if (mp != oldmap) 256 if (mp != oldmap)
257 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
258 if (newmap)
259 *newmap = mp;
260 if (nx)
261 *nx = newx;
262 if (ny)
263 *ny = newy;
264 258
265 retval |= mp->spaces[newx + mp->width * newy].flags; 259 if (newmap) *newmap = mp;
260 if (nx) *nx = newx;
261 if (ny) *ny = newy;
266 262
267 return retval; 263 return retval | mp->at (newx, newy).flags ();
268} 264}
269 265
270/* 266/*
271 * Returns true if the given coordinate is blocked except by the 267 * Returns true if the given coordinate is blocked except by the
272 * object passed is not blocking. This is used with 268 * object passed is not blocking. This is used with
… …
295 } 291 }
296 292
297 /* Save some cycles - instead of calling get_map_flags(), just get the value 293 /* Save some cycles - instead of calling get_map_flags(), just get the value
298 * directly. 294 * directly.
299 */ 295 */
300 mflags = m->spaces[sx + m->width * sy].flags; 296 mflags = m->at (sx, sy).flags ();
301 297
302 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 298 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
303 299
304 /* If space is currently not blocked by anything, no need to 300 /* If space is currently not blocked by anything, no need to
305 * go further. Not true for players - all sorts of special 301 * go further. Not true for players - all sorts of special
… …
324 /* We basically go through the stack of objects, and if there is 320 /* 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 321 * some other object that has NO_PASS or FLAG_ALIVE set, return
326 * true. If we get through the entire stack, that must mean 322 * true. If we get through the entire stack, that must mean
327 * ob is blocking it, so return 0. 323 * ob is blocking it, so return 0.
328 */ 324 */
329 for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) 325 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
330 { 326 {
331 327
332 /* This must be before the checks below. Code for inventory checkers. */ 328 /* This must be before the checks below. Code for inventory checkers. */
333 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 329 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
334 { 330 {
… …
398 * 394 *
399 * Note this used to be arch_blocked, but with new movement 395 * Note this used to be arch_blocked, but with new movement
400 * code, we need to have actual object to check its move_type 396 * code, we need to have actual object to check its move_type
401 * against the move_block values. 397 * against the move_block values.
402 */ 398 */
403
404int 399int
405ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 400ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
406{ 401{
407 archetype *tmp; 402 archetype *tmp;
408 int flag; 403 int flag;
… …
438 433
439 /* Note it is intentional that we check ob - the movement type of the 434 /* Note it is intentional that we check ob - the movement type of the
440 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
441 */ 436 */
442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 437 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy)))
443 return AB_NO_PASS; 438 return P_NO_PASS;
444
445 } 439 }
440
446 return 0; 441 return 0;
447} 442}
448 443
449/* When the map is loaded, load_object does not actually insert objects 444/* 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 445 * into inventory, but just links them. What this does is go through
… …
487 object *tmp, *op, *last, *above; 482 object *tmp, *op, *last, *above;
488 archetype *at; 483 archetype *at;
489 484
490 for (x = 0; x < MAP_WIDTH (m); x++) 485 for (x = 0; x < MAP_WIDTH (m); x++)
491 for (y = 0; y < MAP_HEIGHT (m); y++) 486 for (y = 0; y < MAP_HEIGHT (m); y++)
492 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 487 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
493 { 488 {
494 above = tmp->above; 489 above = tmp->above;
495 490
496 /* already multipart - don't do anything more */ 491 /* already multipart - don't do anything more */
497 if (tmp->head || tmp->more) 492 if (tmp->head || tmp->more)
… …
550 } 545 }
551 546
552 547
553 switch (i) 548 switch (i)
554 { 549 {
555 case LL_NORMAL: 550 case LL_NORMAL:
556 /* if we are loading an overlay, put the floors on the bottom */ 551 /* 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) 552 if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY)
558 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); 553 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
559 else 554 else
560 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 555 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
561 556
562 if (op->inv) 557 if (op->inv)
563 sum_weight (op); 558 sum_weight (op);
564 559
565 prev = op, last_more = op; 560 prev = op, last_more = op;
566 break; 561 break;
567 562
568 case LL_MORE: 563 case LL_MORE:
569 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 564 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY);
570 op->head = prev, last_more->more = op, last_more = op; 565 op->head = prev, last_more->more = op, last_more = op;
571 break; 566 break;
572 } 567 }
573 568
574 if (mapflags & MAP_STYLE) 569 if (mapflags & MAP_STYLE)
575 remove_from_active_list (op); 570 remove_from_active_list (op);
576 571
… …
582 { 577 {
583 for (j = 0; j < m->height; j++) 578 for (j = 0; j < m->height; j++)
584 { 579 {
585 unique = 0; 580 unique = 0;
586 /* check for unique items, or unique squares */ 581 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 582 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
588 { 583 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 584 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 585 unique = 1;
586
591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 587 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
592 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 588 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
593 } 589 }
594 } 590 }
595 } 591 }
… …
612 /* first pass - save one-part objects */ 608 /* first pass - save one-part objects */
613 for (i = 0; i < MAP_WIDTH (m); i++) 609 for (i = 0; i < MAP_WIDTH (m); i++)
614 for (j = 0; j < MAP_HEIGHT (m); j++) 610 for (j = 0; j < MAP_HEIGHT (m); j++)
615 { 611 {
616 unique = 0; 612 unique = 0;
617 for (op = get_map_ob (m, i, j); op; op = op->above) 613 for (op = GET_MAP_OB (m, i, j); op; op = op->above)
618 { 614 {
619 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 615 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
620 unique = 1; 616 unique = 1;
621 617
622 if (op->type == PLAYER) 618 if (op->type == PLAYER)
623 {
624 LOG (llevDebug, "Player on map that is being saved\n");
625 continue; 619 continue;
626 }
627 620
628 if (op->head || op->owner) 621 if (op->head || op->owner)
629 continue; 622 continue;
630 623
631 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
632 save_object (fp2, op, 3); 625 save_object (fp2, op, 3);
633 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 626 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
634 save_object (fp, op, 3); 627 save_object (fp, op, 3);
635 628 }
636 } /* for this space */ 629 }
637 } /* for this j */
638} 630}
639 631
640maptile::maptile () 632maptile::maptile ()
641{ 633{
642 in_memory = MAP_SWAPPED; 634 in_memory = MAP_SWAPPED;
… …
692 { 684 {
693 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 685 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
694 free (spaces); 686 free (spaces);
695 } 687 }
696 688
697 spaces = (MapSpace *) 689 spaces = (mapspace *)
698 calloc (1, width * height * sizeof (MapSpace)); 690 calloc (1, width * height * sizeof (mapspace));
699 691
700 if (!spaces) 692 if (!spaces)
701 fatal (OUT_OF_MEMORY); 693 fatal (OUT_OF_MEMORY);
702} 694}
703 695
… …
729 char *shop_string, *p, *q, *next_semicolon, *next_colon; 721 char *shop_string, *p, *q, *next_semicolon, *next_colon;
730 shopitems *items = NULL; 722 shopitems *items = NULL;
731 int i = 0, number_of_entries = 0; 723 int i = 0, number_of_entries = 0;
732 const typedata *current_type; 724 const typedata *current_type;
733 725
734 shop_string = strdup_local (input_string); 726 shop_string = strdup (input_string);
735 p = shop_string; 727 p = shop_string;
736 /* first we'll count the entries, we'll need that for allocating the array shortly */ 728 /* first we'll count the entries, we'll need that for allocating the array shortly */
737 while (p) 729 while (p)
738 { 730 {
739 p = strchr (p, ';'); 731 p = strchr (p, ';');
… …
925 * with nothing between). There is no reason in those cases to 917 * with nothing between). There is no reason in those cases to
926 * keep the empty message. Also, msgbuf contains garbage data 918 * keep the empty message. Also, msgbuf contains garbage data
927 * when msgpos is zero, so copying it results in crashes 919 * when msgpos is zero, so copying it results in crashes
928 */ 920 */
929 if (msgpos != 0) 921 if (msgpos != 0)
930 m->msg = strdup_local (msgbuf); 922 m->msg = strdup (msgbuf);
931 } 923 }
932 else if (!strcmp (key, "maplore")) 924 else if (!strcmp (key, "maplore"))
933 { 925 {
934 while (fgets (buf, HUGE_BUF, fp) != NULL) 926 while (fgets (buf, HUGE_BUF, fp) != NULL)
935 { 927 {
… …
941 strcpy (maplorebuf + maplorepos, buf); 933 strcpy (maplorebuf + maplorepos, buf);
942 maplorepos += strlen (buf); 934 maplorepos += strlen (buf);
943 } 935 }
944 } 936 }
945 if (maplorepos != 0) 937 if (maplorepos != 0)
946 m->maplore = strdup_local (maplorebuf); 938 m->maplore = strdup (maplorebuf);
947 } 939 }
948 else if (!strcmp (key, "end")) 940 else if (!strcmp (key, "end"))
949 { 941 {
950 break; 942 break;
951 } 943 }
… …
960 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 952 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
961 } 953 }
962 else if (!strcmp (key, "name")) 954 else if (!strcmp (key, "name"))
963 { 955 {
964 *end = 0; 956 *end = 0;
965 m->name = strdup_local (value); 957 m->name = strdup (value);
966 } 958 }
967 /* first strcmp value on these are old names supported 959 /* first strcmp value on these are old names supported
968 * for compatibility reasons. The new values (second) are 960 * for compatibility reasons. The new values (second) are
969 * what really should be used. 961 * what really should be used.
970 */ 962 */
971 else if (!strcmp (key, "oid")) 963 else if (!strcmp (key, "oid"))
972 {
973 fp.get (m, atoi (value)); 964 fp.get (m, atoi (value));
974 }
975 else if (!strcmp (key, "attach")) 965 else if (!strcmp (key, "attach"))
976 {
977 m->attach = value; 966 m->attach = value;
978 }
979 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 967 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
980 {
981 m->enter_x = atoi (value); 968 m->enter_x = atoi (value);
982 }
983 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 969 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
984 {
985 m->enter_y = atoi (value); 970 m->enter_y = atoi (value);
986 }
987 else if (!strcmp (key, "x") || !strcmp (key, "width")) 971 else if (!strcmp (key, "x") || !strcmp (key, "width"))
988 {
989 m->width = atoi (value); 972 m->width = atoi (value);
990 }
991 else if (!strcmp (key, "y") || !strcmp (key, "height")) 973 else if (!strcmp (key, "y") || !strcmp (key, "height"))
992 {
993 m->height = atoi (value); 974 m->height = atoi (value);
994 }
995 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 975 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
996 {
997 m->reset_timeout = atoi (value); 976 m->reset_timeout = atoi (value);
998 }
999 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 977 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1000 {
1001 m->timeout = atoi (value); 978 m->timeout = atoi (value);
1002 }
1003 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 979 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1004 { 980 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1005 m->difficulty = atoi (value);
1006 }
1007 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 981 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1008 {
1009 m->darkness = atoi (value); 982 m->darkness = atoi (value);
1010 }
1011 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 983 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1012 {
1013 m->fixed_resettime = atoi (value); 984 m->fixed_resettime = atoi (value);
1014 }
1015 else if (!strcmp (key, "unique")) 985 else if (!strcmp (key, "unique"))
1016 {
1017 m->unique = atoi (value); 986 m->unique = atoi (value);
1018 }
1019 else if (!strcmp (key, "template")) 987 else if (!strcmp (key, "template"))
1020 {
1021 m->templatemap = atoi (value); 988 m->templatemap = atoi (value);
1022 }
1023 else if (!strcmp (key, "region")) 989 else if (!strcmp (key, "region"))
1024 {
1025 m->region = get_region_by_name (value); 990 m->region = get_region_by_name (value);
1026 }
1027 else if (!strcmp (key, "shopitems")) 991 else if (!strcmp (key, "shopitems"))
1028 { 992 {
1029 *end = 0; 993 *end = 0;
1030 m->shopitems = parse_shop_string (value); 994 m->shopitems = parse_shop_string (value);
1031 } 995 }
1032 else if (!strcmp (key, "shopgreed")) 996 else if (!strcmp (key, "shopgreed"))
1033 {
1034 m->shopgreed = atof (value); 997 m->shopgreed = atof (value);
1035 }
1036 else if (!strcmp (key, "shopmin")) 998 else if (!strcmp (key, "shopmin"))
1037 {
1038 m->shopmin = atol (value); 999 m->shopmin = atol (value);
1039 }
1040 else if (!strcmp (key, "shopmax")) 1000 else if (!strcmp (key, "shopmax"))
1041 {
1042 m->shopmax = atol (value); 1001 m->shopmax = atol (value);
1043 }
1044 else if (!strcmp (key, "shoprace")) 1002 else if (!strcmp (key, "shoprace"))
1045 { 1003 {
1046 *end = 0; 1004 *end = 0;
1047 m->shoprace = strdup_local (value); 1005 m->shoprace = strdup (value);
1048 } 1006 }
1049 else if (!strcmp (key, "outdoor")) 1007 else if (!strcmp (key, "outdoor"))
1050 {
1051 m->outdoor = atoi (value); 1008 m->outdoor = atoi (value);
1052 }
1053 else if (!strcmp (key, "temp")) 1009 else if (!strcmp (key, "temp"))
1054 {
1055 m->temp = atoi (value); 1010 m->temp = atoi (value);
1056 }
1057 else if (!strcmp (key, "pressure")) 1011 else if (!strcmp (key, "pressure"))
1058 {
1059 m->pressure = atoi (value); 1012 m->pressure = atoi (value);
1060 }
1061 else if (!strcmp (key, "humid")) 1013 else if (!strcmp (key, "humid"))
1062 {
1063 m->humid = atoi (value); 1014 m->humid = atoi (value);
1064 }
1065 else if (!strcmp (key, "windspeed")) 1015 else if (!strcmp (key, "windspeed"))
1066 {
1067 m->windspeed = atoi (value); 1016 m->windspeed = atoi (value);
1068 }
1069 else if (!strcmp (key, "winddir")) 1017 else if (!strcmp (key, "winddir"))
1070 {
1071 m->winddir = atoi (value); 1018 m->winddir = atoi (value);
1072 }
1073 else if (!strcmp (key, "sky")) 1019 else if (!strcmp (key, "sky"))
1074 {
1075 m->sky = atoi (value); 1020 m->sky = atoi (value);
1076 }
1077 else if (!strcmp (key, "nosmooth")) 1021 else if (!strcmp (key, "nosmooth"))
1078 {
1079 m->nosmooth = atoi (value); 1022 m->nosmooth = atoi (value);
1080 }
1081 else if (!strncmp (key, "tile_path_", 10)) 1023 else if (!strncmp (key, "tile_path_", 10))
1082 { 1024 {
1083 int tile = atoi (key + 10); 1025 int tile = atoi (key + 10);
1084 1026
1085 if (tile < 1 || tile > 4) 1027 if (tile < 1 || tile > 4)
… …
1118 } 1060 }
1119 1061
1120 if (editor) 1062 if (editor)
1121 { 1063 {
1122 /* Use the value as in the file. */ 1064 /* Use the value as in the file. */
1123 m->tile_path[tile - 1] = strdup_local (value); 1065 m->tile_path[tile - 1] = strdup (value);
1124 } 1066 }
1125 else if (path != NULL) 1067 else if (path != NULL)
1126 { 1068 {
1127 /* Use the normalized value. */ 1069 /* Use the normalized value. */
1128 m->tile_path[tile - 1] = strdup_local (path); 1070 m->tile_path[tile - 1] = strdup (path);
1129 } 1071 }
1130 } /* end if tile direction (in)valid */ 1072 } /* end if tile direction (in)valid */
1131 } 1073 }
1132 else 1074 else
1133 {
1134 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1075 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1135 }
1136 } 1076 }
1077
1137 if (!key || strcmp (key, "end")) 1078 if (!key || strcmp (key, "end"))
1138 { 1079 {
1139 LOG (llevError, "Got premature eof on map header!\n"); 1080 LOG (llevError, "Got premature eof on map header!\n");
1140 return 1; 1081 return 1;
1141 } 1082 }
1083
1142 return 0; 1084 return 0;
1143} 1085}
1144 1086
1145/* 1087/*
1146 * Opens the file "filename" and reads information about the map 1088 * Opens the file "filename" and reads information about the map
… …
1299 for (i = 0; i < MAP_WIDTH (m); i++) 1241 for (i = 0; i < MAP_WIDTH (m); i++)
1300 for (j = 0; j < MAP_HEIGHT (m); j++) 1242 for (j = 0; j < MAP_HEIGHT (m); j++)
1301 { 1243 {
1302 unique = 0; 1244 unique = 0;
1303 1245
1304 for (op = get_map_ob (m, i, j); op; op = next) 1246 for (op = GET_MAP_OB (m, i, j); op; op = next)
1305 { 1247 {
1306 next = op->above; 1248 next = op->above;
1307 1249
1308 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1250 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1309 unique = 1; 1251 unique = 1;
… …
1392 make_path_to_file (filename); 1334 make_path_to_file (filename);
1393 } 1335 }
1394 else 1336 else
1395 { 1337 {
1396 if (!m->tmpname) 1338 if (!m->tmpname)
1397 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1339 m->tmpname = tempnam (settings.tmpdir, NULL);
1398 1340
1399 strcpy (filename, m->tmpname); 1341 strcpy (filename, m->tmpname);
1400 } 1342 }
1401 1343
1402 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1344 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1581 if (!m->in_memory) 1523 if (!m->in_memory)
1582 { 1524 {
1583 LOG (llevError, "Trying to free freed map.\n"); 1525 LOG (llevError, "Trying to free freed map.\n");
1584 return; 1526 return;
1585 } 1527 }
1528
1529 // TODO: use new/delete
1530#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531
1586 if (flag && m->spaces) 1532 if (flag && m->spaces)
1587 free_all_objects (m); 1533 free_all_objects (m);
1588 if (m->name) 1534 if (m->name)
1589 FREE_AND_CLEAR (m->name); 1535 FREE_AND_CLEAR (m->name);
1590 if (m->spaces) 1536 if (m->spaces)
1591 FREE_AND_CLEAR (m->spaces); 1537 FREE_AND_CLEAR (m->spaces);
1592 if (m->msg) 1538 if (m->msg)
1593 FREE_AND_CLEAR (m->msg); 1539 FREE_AND_CLEAR (m->msg);
1594 if (m->maplore) 1540 if (m->maplore)
1595 FREE_AND_CLEAR (m->maplore); 1541 FREE_AND_CLEAR (m->maplore);
1596 if (m->shopitems) 1542
1597 delete[]m->shopitems; 1543 delete [] m->shopitems;
1598 m->shopitems = 0; 1544 m->shopitems = 0;
1545
1599 if (m->shoprace) 1546 if (m->shoprace)
1600 FREE_AND_CLEAR (m->shoprace); 1547 FREE_AND_CLEAR (m->shoprace);
1548
1601 if (m->buttons) 1549 if (m->buttons)
1602 free_objectlinkpt (m->buttons); 1550 free_objectlinkpt (m->buttons);
1551
1603 m->buttons = NULL; 1552 m->buttons = NULL;
1553
1604 for (i = 0; i < 4; i++) 1554 for (i = 0; i < 4; i++)
1605 { 1555 {
1606 if (m->tile_path[i]) 1556 if (m->tile_path[i])
1607 FREE_AND_CLEAR (m->tile_path[i]); 1557 FREE_AND_CLEAR (m->tile_path[i]);
1608 m->tile_map[i] = NULL; 1558 m->tile_map[i] = NULL;
1609 } 1559 }
1560
1610 m->in_memory = MAP_SWAPPED; 1561 m->in_memory = MAP_SWAPPED;
1562
1563#undef FREE_AND_CLEAR
1564
1611} 1565}
1612 1566
1613/* 1567/*
1614 * function: vanish maptile 1568 * function: vanish maptile
1615 * m : pointer to maptile, if NULL no action 1569 * m : pointer to maptile, if NULL no action
… …
1675 else 1629 else
1676 last->next = m->next; 1630 last->next = m->next;
1677 1631
1678 delete m; 1632 delete m;
1679} 1633}
1680
1681
1682 1634
1683/* 1635/*
1684 * Makes sure the given map is loaded and swapped in. 1636 * Makes sure the given map is loaded and swapped in.
1685 * name is path name of the map. 1637 * name is path name of the map.
1686 * flags meaning: 1638 * flags meaning:
… …
1689 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1641 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1690 * dont do any more name translation on it. 1642 * dont do any more name translation on it.
1691 * 1643 *
1692 * Returns a pointer to the given map. 1644 * Returns a pointer to the given map.
1693 */ 1645 */
1694
1695maptile * 1646maptile *
1696ready_map_name (const char *name, int flags) 1647ready_map_name (const char *name, int flags)
1697{ 1648{
1698 maptile *m; 1649 maptile *m;
1699 1650
… …
1822 return MAP_DIFFICULTY (m); 1773 return MAP_DIFFICULTY (m);
1823 } 1774 }
1824 1775
1825 for (x = 0; x < MAP_WIDTH (m); x++) 1776 for (x = 0; x < MAP_WIDTH (m); x++)
1826 for (y = 0; y < MAP_HEIGHT (m); y++) 1777 for (y = 0; y < MAP_HEIGHT (m); y++)
1827 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1778 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1828 { 1779 {
1829 if (QUERY_FLAG (op, FLAG_MONSTER)) 1780 if (QUERY_FLAG (op, FLAG_MONSTER))
1830 { 1781 {
1831 total_exp += op->stats.exp; 1782 total_exp += op->stats.exp;
1832 monster_cnt++; 1783 monster_cnt++;
… …
1925 /* All clients need to get re-updated for the change */ 1876 /* All clients need to get re-updated for the change */
1926 update_all_map_los (m); 1877 update_all_map_los (m);
1927 return 1; 1878 return 1;
1928} 1879}
1929 1880
1930
1931/* 1881/*
1932 * This function updates various attributes about a specific space 1882 * This function updates various attributes about a specific space
1933 * on the map (what it looks like, whether it blocks magic, 1883 * on the map (what it looks like, whether it blocks magic,
1934 * has a living creatures, prevents people from passing 1884 * has a living creatures, prevents people from passing
1935 * through, etc) 1885 * through, etc)
1936 */ 1886 */
1937void 1887void
1938update_position (maptile *m, int x, int y) 1888mapspace::update_ ()
1939{ 1889{
1940 object *tmp, *last = NULL; 1890 object *tmp, *last = 0;
1941 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1891 uint8 flags = 0, light = 0, anywhere = 0;
1942 New_Face *top, *floor, *middle; 1892 New_Face *top, *floor, *middle;
1943 object *top_obj, *floor_obj, *middle_obj; 1893 object *top_obj, *floor_obj, *middle_obj;
1944 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1894 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1945 1895
1946 oldflags = GET_MAP_FLAGS (m, x, y);
1947 if (!(oldflags & P_NEED_UPDATE))
1948 {
1949 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1950 return;
1951 }
1952
1953 middle = blank_face; 1896 middle = blank_face;
1954 top = blank_face; 1897 top = blank_face;
1955 floor = blank_face; 1898 floor = blank_face;
1956 1899
1957 middle_obj = NULL; 1900 middle_obj = 0;
1958 top_obj = NULL; 1901 top_obj = 0;
1959 floor_obj = NULL; 1902 floor_obj = 0;
1960 1903
1961 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1962 { 1905 {
1963
1964 /* This could be made additive I guess (two lights better than 1906 /* This could be made additive I guess (two lights better than
1965 * one). But if so, it shouldn't be a simple additive - 2 1907 * one). But if so, it shouldn't be a simple additive - 2
1966 * light bulbs do not illuminate twice as far as once since 1908 * light bulbs do not illuminate twice as far as once since
1967 * it is a disapation factor that is squared (or is it cubed?) 1909 * it is a dissapation factor that is cubed.
1968 */ 1910 */
1969 if (tmp->glow_radius > light) 1911 if (tmp->glow_radius > light)
1970 light = tmp->glow_radius; 1912 light = tmp->glow_radius;
1971 1913
1972 /* This call is needed in order to update objects the player 1914 /* This call is needed in order to update objects the player
… …
2010 { 1952 {
2011 middle = tmp->face; 1953 middle = tmp->face;
2012 middle_obj = tmp; 1954 middle_obj = tmp;
2013 } 1955 }
2014 } 1956 }
1957
2015 if (tmp == tmp->above) 1958 if (tmp == tmp->above)
2016 { 1959 {
2017 LOG (llevError, "Error in structure of map\n"); 1960 LOG (llevError, "Error in structure of map\n");
2018 exit (-1); 1961 exit (-1);
2019 } 1962 }
2020 1963
2021 move_slow |= tmp->move_slow; 1964 move_slow |= tmp->move_slow;
2022 move_block |= tmp->move_block; 1965 move_block |= tmp->move_block;
2023 move_on |= tmp->move_on; 1966 move_on |= tmp->move_on;
2024 move_off |= tmp->move_off; 1967 move_off |= tmp->move_off;
2025 move_allow |= tmp->move_allow; 1968 move_allow |= tmp->move_allow;
2026 1969
2027 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2028 flags |= P_IS_ALIVE;
2029 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2030 flags |= P_NO_MAGIC;
2031 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2032 flags |= P_NO_CLERIC;
2033 if (tmp->type == SAFE_GROUND)
2034 flags |= P_SAFE;
2035
2036 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1970 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2037 flags |= P_BLOCKSVIEW; 1971 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2038 } /* for stack of objects */ 1972 if (tmp->type == PLAYER) flags |= P_PLAYER;
2039 1973 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2040 /* we don't want to rely on this function to have accurate flags, but 1974 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2041 * since we're already doing the work, we calculate them here. 1975 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2042 * if they don't match, logic is broken someplace.
2043 */
2044 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2045 { 1976 }
2046 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1977
2047 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1978 this->light = light;
2048 } 1979 this->flags_ = flags;
2049 SET_MAP_FLAGS (m, x, y, flags); 1980 this->move_block = move_block & ~move_allow;
2050 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1981 this->move_on = move_on;
2051 SET_MAP_MOVE_ON (m, x, y, move_on); 1982 this->move_off = move_off;
2052 SET_MAP_MOVE_OFF (m, x, y, move_off); 1983 this->move_slow = move_slow;
2053 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2054 1984
2055 /* At this point, we have a floor face (if there is a floor), 1985 /* At this point, we have a floor face (if there is a floor),
2056 * and the floor is set - we are not going to touch it at 1986 * and the floor is set - we are not going to touch it at
2057 * this point. 1987 * this point.
2058 * middle contains the highest visibility face. 1988 * middle contains the highest visibility face.
… …
2112 break; 2042 break;
2113 } 2043 }
2114 } 2044 }
2115 } 2045 }
2116 } 2046 }
2047
2117 if (middle == floor) 2048 if (middle == floor)
2118 middle = blank_face; 2049 middle = blank_face;
2050
2119 if (top == middle) 2051 if (top == middle)
2120 middle = blank_face; 2052 middle = blank_face;
2121 SET_MAP_FACE (m, x, y, top, 0);
2122 if (top != blank_face)
2123 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2124 else
2125 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2126 SET_MAP_FACE (m, x, y, middle, 1);
2127 if (middle != blank_face)
2128 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2129 else
2130 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2131 SET_MAP_FACE (m, x, y, floor, 2);
2132 if (floor != blank_face)
2133 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2134 else
2135 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2136 SET_MAP_LIGHT (m, x, y, light);
2137}
2138 2053
2054 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
2055 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
2056 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
2057}
2139 2058
2140void 2059void
2141set_map_reset_time (maptile *map) 2060set_map_reset_time (maptile *map)
2142{ 2061{
2143 int timeout; 2062 int timeout;
… …
2145 timeout = MAP_RESET_TIMEOUT (map); 2064 timeout = MAP_RESET_TIMEOUT (map);
2146 if (timeout <= 0) 2065 if (timeout <= 0)
2147 timeout = MAP_DEFAULTRESET; 2066 timeout = MAP_DEFAULTRESET;
2148 if (timeout >= MAP_MAXRESET) 2067 if (timeout >= MAP_MAXRESET)
2149 timeout = MAP_MAXRESET; 2068 timeout = MAP_MAXRESET;
2150 MAP_WHEN_RESET (map) = seconds () + timeout; 2069 MAP_WHEN_RESET (map) = time (0) + timeout;
2151} 2070}
2152 2071
2153/* this updates the orig_map->tile_map[tile_num] value after loading 2072/* this updates the orig_map->tile_map[tile_num] value after loading
2154 * the map. It also takes care of linking back the freshly loaded 2073 * the map. It also takes care of linking back the freshly loaded
2155 * maps tile_map values if it tiles back to this one. It returns 2074 * maps tile_map values if it tiles back to this one. It returns
… …
2183 * 2102 *
2184 */ 2103 */
2185int 2104int
2186out_of_map (maptile *m, int x, int y) 2105out_of_map (maptile *m, int x, int y)
2187{ 2106{
2188
2189 /* If we get passed a null map, this is obviously the 2107 /* If we get passed a null map, this is obviously the
2190 * case. This generally shouldn't happen, but if the 2108 * case. This generally shouldn't happen, but if the
2191 * map loads fail below, it could happen. 2109 * map loads fail below, it could happen.
2192 */ 2110 */
2193 if (!m) 2111 if (!m)
… …
2195 2113
2196 if (x < 0) 2114 if (x < 0)
2197 { 2115 {
2198 if (!m->tile_path[3]) 2116 if (!m->tile_path[3])
2199 return 1; 2117 return 1;
2118
2200 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2201 {
2202 load_and_link_tiled_map (m, 3); 2120 load_and_link_tiled_map (m, 3);
2203 } 2121
2204 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2122 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y));
2205 } 2123 }
2124
2206 if (x >= MAP_WIDTH (m)) 2125 if (x >= MAP_WIDTH (m))
2207 { 2126 {
2208 if (!m->tile_path[1]) 2127 if (!m->tile_path[1])
2209 return 1; 2128 return 1;
2129
2210 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2130 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2211 {
2212 load_and_link_tiled_map (m, 1); 2131 load_and_link_tiled_map (m, 1);
2213 } 2132
2214 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2133 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));
2215 } 2134 }
2135
2216 if (y < 0) 2136 if (y < 0)
2217 { 2137 {
2218 if (!m->tile_path[0]) 2138 if (!m->tile_path[0])
2219 return 1; 2139 return 1;
2140
2220 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2141 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2221 {
2222 load_and_link_tiled_map (m, 0); 2142 load_and_link_tiled_map (m, 0);
2223 } 2143
2224 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2144 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0])));
2225 } 2145 }
2146
2226 if (y >= MAP_HEIGHT (m)) 2147 if (y >= MAP_HEIGHT (m))
2227 { 2148 {
2228 if (!m->tile_path[2]) 2149 if (!m->tile_path[2])
2229 return 1; 2150 return 1;
2151
2230 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2152 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2231 {
2232 load_and_link_tiled_map (m, 2); 2153 load_and_link_tiled_map (m, 2);
2233 } 2154
2234 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2155 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));
2235 } 2156 }
2236 2157
2237 /* Simple case - coordinates are within this local 2158 /* Simple case - coordinates are within this local
2238 * map. 2159 * map.
… …
2253{ 2174{
2254 2175
2255 if (*x < 0) 2176 if (*x < 0)
2256 { 2177 {
2257 if (!m->tile_path[3]) 2178 if (!m->tile_path[3])
2258 return NULL; 2179 return 0;
2259 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2180 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2260 load_and_link_tiled_map (m, 3); 2181 load_and_link_tiled_map (m, 3);
2261 2182
2262 *x += MAP_WIDTH (m->tile_map[3]); 2183 *x += MAP_WIDTH (m->tile_map[3]);
2263 return (get_map_from_coord (m->tile_map[3], x, y)); 2184 return (get_map_from_coord (m->tile_map[3], x, y));
2264 } 2185 }
2186
2265 if (*x >= MAP_WIDTH (m)) 2187 if (*x >= MAP_WIDTH (m))
2266 { 2188 {
2267 if (!m->tile_path[1]) 2189 if (!m->tile_path[1])
2268 return NULL; 2190 return 0;
2191
2269 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2192 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2270 load_and_link_tiled_map (m, 1); 2193 load_and_link_tiled_map (m, 1);
2271 2194
2272 *x -= MAP_WIDTH (m); 2195 *x -= MAP_WIDTH (m);
2273 return (get_map_from_coord (m->tile_map[1], x, y)); 2196 return (get_map_from_coord (m->tile_map[1], x, y));
2274 } 2197 }
2198
2275 if (*y < 0) 2199 if (*y < 0)
2276 { 2200 {
2277 if (!m->tile_path[0]) 2201 if (!m->tile_path[0])
2278 return NULL; 2202 return 0;
2203
2279 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2204 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2280 load_and_link_tiled_map (m, 0); 2205 load_and_link_tiled_map (m, 0);
2281 2206
2282 *y += MAP_HEIGHT (m->tile_map[0]); 2207 *y += MAP_HEIGHT (m->tile_map[0]);
2283 return (get_map_from_coord (m->tile_map[0], x, y)); 2208 return (get_map_from_coord (m->tile_map[0], x, y));
2284 } 2209 }
2210
2285 if (*y >= MAP_HEIGHT (m)) 2211 if (*y >= MAP_HEIGHT (m))
2286 { 2212 {
2287 if (!m->tile_path[2]) 2213 if (!m->tile_path[2])
2288 return NULL; 2214 return 0;
2215
2289 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2216 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2290 load_and_link_tiled_map (m, 2); 2217 load_and_link_tiled_map (m, 2);
2291 2218
2292 *y -= MAP_HEIGHT (m); 2219 *y -= MAP_HEIGHT (m);
2293 return (get_map_from_coord (m->tile_map[2], x, y)); 2220 return (get_map_from_coord (m->tile_map[2], x, y));

Diff Legend

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