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.48 by root, Mon Dec 25 14:43:22 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 */
… …
197 196
198void 197void
199dump_map (const maptile *m) 198dump_map (const maptile *m)
200{ 199{
201 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); 200 LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory);
202 LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); 201 LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, MAP_ENTER_X (m), MAP_ENTER_Y (m));
203 202
204 if (m->msg != NULL) 203 if (m->msg != NULL)
205 LOG (llevError, "Message:\n%s", m->msg); 204 LOG (llevError, "Message:\n%s", m->msg);
206 205
207 if (m->maplore != NULL) 206 if (m->maplore != NULL)
… …
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;
… …
414 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 409 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
415 if (flag & P_OUT_OF_MAP) 410 if (flag & P_OUT_OF_MAP)
416 return P_OUT_OF_MAP; 411 return P_OUT_OF_MAP;
417 412
418 /* don't have object, so don't know what types would block */ 413 /* don't have object, so don't know what types would block */
419 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 414 return m1->at (sx, sy).move_block;
420 } 415 }
421 416
422 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 417 for (tmp = ob->arch; tmp; tmp = tmp->more)
423 { 418 {
424 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 419 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);
425 420
426 if (flag & P_OUT_OF_MAP) 421 if (flag & P_OUT_OF_MAP)
427 return P_OUT_OF_MAP; 422 return P_OUT_OF_MAP;
428 if (flag & P_IS_ALIVE) 423 if (flag & P_IS_ALIVE)
429 return P_IS_ALIVE; 424 return P_IS_ALIVE;
430 425
426 mapspace &ms = m1->at (sx, sy);
427
428
431 /* find_first_free_spot() calls this function. However, often 429 /* find_first_free_spot() calls this function. However, often
432 * ob doesn't have any move type (when used to place exits) 430 * ob doesn't have any move type (when used to place exits)
433 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 431 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
434 */ 432 */
435 433
436 if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) 434 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
437 continue; 435 continue;
438 436
439 /* 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
440 * head of the object should correspond for the entire object. 438 * head of the object should correspond for the entire object.
441 */ 439 */
442 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 440 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
443 return AB_NO_PASS; 441 return P_NO_PASS;
444
445 } 442 }
443
446 return 0; 444 return 0;
447} 445}
448 446
449/* 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
450 * 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
… …
485{ 483{
486 int x, y; 484 int x, y;
487 object *tmp, *op, *last, *above; 485 object *tmp, *op, *last, *above;
488 archetype *at; 486 archetype *at;
489 487
490 for (x = 0; x < MAP_WIDTH (m); x++) 488 for (x = 0; x < m->width; x++)
491 for (y = 0; y < MAP_HEIGHT (m); y++) 489 for (y = 0; y < m->height; y++)
492 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)
493 { 491 {
494 above = tmp->above; 492 above = tmp->above;
495 493
496 /* already multipart - don't do anything more */ 494 /* already multipart - don't do anything more */
497 if (tmp->head || tmp->more) 495 if (tmp->head || tmp->more)
… …
547 { 545 {
548 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 546 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");
549 continue; 547 continue;
550 } 548 }
551 549
552
553 switch (i) 550 switch (i)
554 { 551 {
555 case LL_NORMAL: 552 case LL_NORMAL:
556 /* if we are loading an overlay, put the floors on the bottom */ 553 /* 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) 554 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); 555 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD);
559 else 556 else
560 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 557 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
561 558
562 if (op->inv) 559 if (op->inv)
563 sum_weight (op); 560 sum_weight (op);
564 561
565 prev = op, last_more = op; 562 prev = op, last_more = op;
566 break; 563 break;
567 564
568 case LL_MORE: 565 case LL_MORE:
569 insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 566 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; 567 op->head = prev, last_more->more = op, last_more = op;
571 break; 568 break;
572 } 569 }
573 570
574 if (mapflags & MAP_STYLE) 571 if (mapflags & MAP_STYLE)
575 remove_from_active_list (op); 572 remove_from_active_list (op);
576 573
… …
582 { 579 {
583 for (j = 0; j < m->height; j++) 580 for (j = 0; j < m->height; j++)
584 { 581 {
585 unique = 0; 582 unique = 0;
586 /* check for unique items, or unique squares */ 583 /* check for unique items, or unique squares */
587 for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) 584 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
588 { 585 {
589 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) 586 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
590 unique = 1; 587 unique = 1;
588
591 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 589 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
592 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 590 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
593 } 591 }
594 } 592 }
595 } 593 }
… …
608{ 606{
609 int i, j = 0, unique = 0; 607 int i, j = 0, unique = 0;
610 object *op; 608 object *op;
611 609
612 /* first pass - save one-part objects */ 610 /* first pass - save one-part objects */
613 for (i = 0; i < MAP_WIDTH (m); i++) 611 for (i = 0; i < m->width; i++)
614 for (j = 0; j < MAP_HEIGHT (m); j++) 612 for (j = 0; j < m->height; j++)
615 { 613 {
616 unique = 0; 614 unique = 0;
617 for (op = get_map_ob (m, i, j); op; op = op->above) 615 for (op = m->at (i, j).bottom; op; op = op->above)
618 { 616 {
619 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 617 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
620 unique = 1; 618 unique = 1;
621 619
622 if (op->type == PLAYER) 620 if (op->type == PLAYER)
623 {
624 LOG (llevDebug, "Player on map that is being saved\n");
625 continue; 621 continue;
626 }
627 622
628 if (op->head || op->owner) 623 if (op->head || op->owner)
629 continue; 624 continue;
630 625
631 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 626 if (unique || op->flag [FLAG_UNIQUE])
632 save_object (fp2, op, 3); 627 save_object (fp2, op, 3);
633 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 628 else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID])))
634 save_object (fp, op, 3); 629 save_object (fp, op, 3);
635 630 }
636 } /* for this space */ 631 }
637 } /* for this j */
638} 632}
639 633
640maptile::maptile () 634maptile::maptile ()
641{ 635{
642 in_memory = MAP_SWAPPED; 636 in_memory = MAP_SWAPPED;
643 /* The maps used to pick up default x and y values from the 637 /* The maps used to pick up default x and y values from the
644 * map archetype. Mimic that behaviour. 638 * map archetype. Mimic that behaviour.
645 */ 639 */
646 MAP_WIDTH (this) = 16; 640 this->width = 16;
647 MAP_HEIGHT (this) = 16; 641 this->height = 16;
648 MAP_RESET_TIMEOUT (this) = 0; 642 MAP_RESET_TIMEOUT (this) = 0;
649 MAP_TIMEOUT (this) = 300; 643 MAP_TIMEOUT (this) = 300;
650 MAP_ENTER_X (this) = 0; 644 MAP_ENTER_X (this) = 0;
651 MAP_ENTER_Y (this) = 0; 645 MAP_ENTER_Y (this) = 0;
652 /*set part to -1 indicating conversion to weather map not yet done */ 646 /*set part to -1 indicating conversion to weather map not yet done */
… …
692 { 686 {
693 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); 687 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
694 free (spaces); 688 free (spaces);
695 } 689 }
696 690
697 spaces = (MapSpace *) 691 spaces = (mapspace *)
698 calloc (1, width * height * sizeof (MapSpace)); 692 calloc (1, width * height * sizeof (mapspace));
699 693
700 if (!spaces) 694 if (!spaces)
701 fatal (OUT_OF_MEMORY); 695 fatal (OUT_OF_MEMORY);
702} 696}
703 697
… …
729 char *shop_string, *p, *q, *next_semicolon, *next_colon; 723 char *shop_string, *p, *q, *next_semicolon, *next_colon;
730 shopitems *items = NULL; 724 shopitems *items = NULL;
731 int i = 0, number_of_entries = 0; 725 int i = 0, number_of_entries = 0;
732 const typedata *current_type; 726 const typedata *current_type;
733 727
734 shop_string = strdup_local (input_string); 728 shop_string = strdup (input_string);
735 p = shop_string; 729 p = shop_string;
736 /* first we'll count the entries, we'll need that for allocating the array shortly */ 730 /* first we'll count the entries, we'll need that for allocating the array shortly */
737 while (p) 731 while (p)
738 { 732 {
739 p = strchr (p, ';'); 733 p = strchr (p, ';');
… …
925 * with nothing between). There is no reason in those cases to 919 * with nothing between). There is no reason in those cases to
926 * keep the empty message. Also, msgbuf contains garbage data 920 * keep the empty message. Also, msgbuf contains garbage data
927 * when msgpos is zero, so copying it results in crashes 921 * when msgpos is zero, so copying it results in crashes
928 */ 922 */
929 if (msgpos != 0) 923 if (msgpos != 0)
930 m->msg = strdup_local (msgbuf); 924 m->msg = strdup (msgbuf);
931 } 925 }
932 else if (!strcmp (key, "maplore")) 926 else if (!strcmp (key, "maplore"))
933 { 927 {
934 while (fgets (buf, HUGE_BUF, fp) != NULL) 928 while (fgets (buf, HUGE_BUF, fp) != NULL)
935 { 929 {
… …
941 strcpy (maplorebuf + maplorepos, buf); 935 strcpy (maplorebuf + maplorepos, buf);
942 maplorepos += strlen (buf); 936 maplorepos += strlen (buf);
943 } 937 }
944 } 938 }
945 if (maplorepos != 0) 939 if (maplorepos != 0)
946 m->maplore = strdup_local (maplorebuf); 940 m->maplore = strdup (maplorebuf);
947 } 941 }
948 else if (!strcmp (key, "end")) 942 else if (!strcmp (key, "end"))
949 { 943 {
950 break; 944 break;
951 } 945 }
… …
960 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); 954 LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value);
961 } 955 }
962 else if (!strcmp (key, "name")) 956 else if (!strcmp (key, "name"))
963 { 957 {
964 *end = 0; 958 *end = 0;
965 m->name = strdup_local (value); 959 m->name = strdup (value);
966 } 960 }
967 /* first strcmp value on these are old names supported 961 /* first strcmp value on these are old names supported
968 * for compatibility reasons. The new values (second) are 962 * for compatibility reasons. The new values (second) are
969 * what really should be used. 963 * what really should be used.
970 */ 964 */
971 else if (!strcmp (key, "oid")) 965 else if (!strcmp (key, "oid"))
972 {
973 fp.get (m, atoi (value)); 966 fp.get (m, atoi (value));
974 }
975 else if (!strcmp (key, "attach")) 967 else if (!strcmp (key, "attach"))
976 {
977 m->attach = value; 968 m->attach = value;
978 }
979 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 969 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
980 {
981 m->enter_x = atoi (value); 970 m->enter_x = atoi (value);
982 }
983 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 971 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
984 {
985 m->enter_y = atoi (value); 972 m->enter_y = atoi (value);
986 }
987 else if (!strcmp (key, "x") || !strcmp (key, "width")) 973 else if (!strcmp (key, "x") || !strcmp (key, "width"))
988 {
989 m->width = atoi (value); 974 m->width = atoi (value);
990 }
991 else if (!strcmp (key, "y") || !strcmp (key, "height")) 975 else if (!strcmp (key, "y") || !strcmp (key, "height"))
992 {
993 m->height = atoi (value); 976 m->height = atoi (value);
994 }
995 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 977 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
996 {
997 m->reset_timeout = atoi (value); 978 m->reset_timeout = atoi (value);
998 }
999 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 979 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1000 {
1001 m->timeout = atoi (value); 980 m->timeout = atoi (value);
1002 }
1003 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 981 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1004 { 982 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1005 m->difficulty = atoi (value);
1006 }
1007 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 983 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1008 {
1009 m->darkness = atoi (value); 984 m->darkness = atoi (value);
1010 }
1011 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 985 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1012 {
1013 m->fixed_resettime = atoi (value); 986 m->fixed_resettime = atoi (value);
1014 }
1015 else if (!strcmp (key, "unique")) 987 else if (!strcmp (key, "unique"))
1016 {
1017 m->unique = atoi (value); 988 m->unique = atoi (value);
1018 }
1019 else if (!strcmp (key, "template")) 989 else if (!strcmp (key, "template"))
1020 {
1021 m->templatemap = atoi (value); 990 m->templatemap = atoi (value);
1022 }
1023 else if (!strcmp (key, "region")) 991 else if (!strcmp (key, "region"))
1024 {
1025 m->region = get_region_by_name (value); 992 m->region = get_region_by_name (value);
1026 }
1027 else if (!strcmp (key, "shopitems")) 993 else if (!strcmp (key, "shopitems"))
1028 { 994 {
1029 *end = 0; 995 *end = 0;
1030 m->shopitems = parse_shop_string (value); 996 m->shopitems = parse_shop_string (value);
1031 } 997 }
1032 else if (!strcmp (key, "shopgreed")) 998 else if (!strcmp (key, "shopgreed"))
1033 {
1034 m->shopgreed = atof (value); 999 m->shopgreed = atof (value);
1035 }
1036 else if (!strcmp (key, "shopmin")) 1000 else if (!strcmp (key, "shopmin"))
1037 {
1038 m->shopmin = atol (value); 1001 m->shopmin = atol (value);
1039 }
1040 else if (!strcmp (key, "shopmax")) 1002 else if (!strcmp (key, "shopmax"))
1041 {
1042 m->shopmax = atol (value); 1003 m->shopmax = atol (value);
1043 }
1044 else if (!strcmp (key, "shoprace")) 1004 else if (!strcmp (key, "shoprace"))
1045 { 1005 {
1046 *end = 0; 1006 *end = 0;
1047 m->shoprace = strdup_local (value); 1007 m->shoprace = strdup (value);
1048 } 1008 }
1049 else if (!strcmp (key, "outdoor")) 1009 else if (!strcmp (key, "outdoor"))
1050 {
1051 m->outdoor = atoi (value); 1010 m->outdoor = atoi (value);
1052 }
1053 else if (!strcmp (key, "temp")) 1011 else if (!strcmp (key, "temp"))
1054 {
1055 m->temp = atoi (value); 1012 m->temp = atoi (value);
1056 }
1057 else if (!strcmp (key, "pressure")) 1013 else if (!strcmp (key, "pressure"))
1058 {
1059 m->pressure = atoi (value); 1014 m->pressure = atoi (value);
1060 }
1061 else if (!strcmp (key, "humid")) 1015 else if (!strcmp (key, "humid"))
1062 {
1063 m->humid = atoi (value); 1016 m->humid = atoi (value);
1064 }
1065 else if (!strcmp (key, "windspeed")) 1017 else if (!strcmp (key, "windspeed"))
1066 {
1067 m->windspeed = atoi (value); 1018 m->windspeed = atoi (value);
1068 }
1069 else if (!strcmp (key, "winddir")) 1019 else if (!strcmp (key, "winddir"))
1070 {
1071 m->winddir = atoi (value); 1020 m->winddir = atoi (value);
1072 }
1073 else if (!strcmp (key, "sky")) 1021 else if (!strcmp (key, "sky"))
1074 {
1075 m->sky = atoi (value); 1022 m->sky = atoi (value);
1076 }
1077 else if (!strcmp (key, "nosmooth")) 1023 else if (!strcmp (key, "nosmooth"))
1078 {
1079 m->nosmooth = atoi (value); 1024 m->nosmooth = atoi (value);
1080 }
1081 else if (!strncmp (key, "tile_path_", 10)) 1025 else if (!strncmp (key, "tile_path_", 10))
1082 { 1026 {
1083 int tile = atoi (key + 10); 1027 int tile = atoi (key + 10);
1084 1028
1085 if (tile < 1 || tile > 4) 1029 if (tile < 1 || tile > 4)
… …
1118 } 1062 }
1119 1063
1120 if (editor) 1064 if (editor)
1121 { 1065 {
1122 /* Use the value as in the file. */ 1066 /* Use the value as in the file. */
1123 m->tile_path[tile - 1] = strdup_local (value); 1067 m->tile_path[tile - 1] = strdup (value);
1124 } 1068 }
1125 else if (path != NULL) 1069 else if (path != NULL)
1126 { 1070 {
1127 /* Use the normalized value. */ 1071 /* Use the normalized value. */
1128 m->tile_path[tile - 1] = strdup_local (path); 1072 m->tile_path[tile - 1] = strdup (path);
1129 } 1073 }
1130 } /* end if tile direction (in)valid */ 1074 } /* end if tile direction (in)valid */
1131 } 1075 }
1132 else 1076 else
1133 {
1134 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); 1077 LOG (llevError, "Got unknown value in map header: %s %s\n", key, value);
1135 }
1136 } 1078 }
1079
1137 if (!key || strcmp (key, "end")) 1080 if (!key || strcmp (key, "end"))
1138 { 1081 {
1139 LOG (llevError, "Got premature eof on map header!\n"); 1082 LOG (llevError, "Got premature eof on map header!\n");
1140 return 1; 1083 return 1;
1141 } 1084 }
1085
1142 return 0; 1086 return 0;
1143} 1087}
1144 1088
1145/* 1089/*
1146 * Opens the file "filename" and reads information about the map 1090 * Opens the file "filename" and reads information about the map
… …
1179 strcpy (m->path, filename); 1123 strcpy (m->path, filename);
1180 if (load_map_header (thawer, m)) 1124 if (load_map_header (thawer, m))
1181 { 1125 {
1182 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1126 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1183 delete_map (m); 1127 delete_map (m);
1184 return NULL; 1128 return 0;
1185 } 1129 }
1186 1130
1187 m->allocate (); 1131 m->allocate ();
1188 1132
1189 m->in_memory = MAP_LOADING; 1133 m->in_memory = MAP_LOADING;
… …
1272 if (load_map_header (thawer, m)) 1216 if (load_map_header (thawer, m))
1273 { 1217 {
1274 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1218 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1275 delete_map (m); 1219 delete_map (m);
1276 m = load_original_map (m->path, 0); 1220 m = load_original_map (m->path, 0);
1277 return NULL; 1221 return 0;
1278 } 1222 }
1279 /*m->allocate ();*/ 1223 /*m->allocate ();*/
1280 1224
1281 m->in_memory = MAP_LOADING; 1225 m->in_memory = MAP_LOADING;
1282 load_objects (m, thawer, MAP_OVERLAY); 1226 load_objects (m, thawer, MAP_OVERLAY);
… …
1294delete_unique_items (maptile *m) 1238delete_unique_items (maptile *m)
1295{ 1239{
1296 int i, j, unique; 1240 int i, j, unique;
1297 object *op, *next; 1241 object *op, *next;
1298 1242
1299 for (i = 0; i < MAP_WIDTH (m); i++) 1243 for (i = 0; i < m->width; i++)
1300 for (j = 0; j < MAP_HEIGHT (m); j++) 1244 for (j = 0; j < m->height; j++)
1301 { 1245 {
1302 unique = 0; 1246 unique = 0;
1303 1247
1304 for (op = get_map_ob (m, i, j); op; op = next) 1248 for (op = GET_MAP_OB (m, i, j); op; op = next)
1305 { 1249 {
1306 next = op->above; 1250 next = op->above;
1307 1251
1308 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 1252 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
1309 unique = 1; 1253 unique = 1;
1310 1254
1311 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1255 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1312 { 1256 {
1313 clean_object (op); 1257 op->destroy_inv (false);
1314
1315 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1316 remove_button_link (op);
1317
1318 op->destroy (); 1258 op->destroy ();
1319 } 1259 }
1320 } 1260 }
1321 } 1261 }
1322} 1262}
… …
1392 make_path_to_file (filename); 1332 make_path_to_file (filename);
1393 } 1333 }
1394 else 1334 else
1395 { 1335 {
1396 if (!m->tmpname) 1336 if (!m->tmpname)
1397 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1337 m->tmpname = tempnam (settings.tmpdir, NULL);
1398 1338
1399 strcpy (filename, m->tmpname); 1339 strcpy (filename, m->tmpname);
1400 } 1340 }
1401 1341
1402 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1342 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1504 freezer.save (filename); 1444 freezer.save (filename);
1505 1445
1506 return 0; 1446 return 0;
1507} 1447}
1508 1448
1509
1510/*
1511 * Remove and free all objects in the inventory of the given object.
1512 * object.c ?
1513 */
1514
1515void
1516clean_object (object *op)
1517{
1518 object *tmp, *next;
1519
1520 for (tmp = op->inv; tmp; tmp = next)
1521 {
1522 next = tmp->below;
1523
1524 clean_object (tmp);
1525 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1526 remove_button_link (tmp);
1527
1528 tmp->destroy ();
1529 }
1530}
1531
1532/* 1449/*
1533 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1534 */ 1451 */
1535
1536void 1452void
1537free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1538{ 1454{
1539 int i, j; 1455 if (!m->spaces)
1540 object *op; 1456 return;
1541 1457
1542 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < m->width; i++)
1543 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < m->height; j++)
1544 { 1460 {
1545 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1546 1462
1547 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bottom)
1548 { 1464 {
1549 if (op == previous_obj)
1550 {
1551 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1552 break;
1553 }
1554
1555 previous_obj = op;
1556
1557 if (op->head != NULL) 1465 if (op->head)
1558 op = op->head; 1466 op = op->head;
1559 1467
1560 /* If the map isn't in memory, free_object will remove and 1468 op->destroy_inv (false);
1561 * free objects in op's inventory. So let it do the job.
1562 */
1563 if (m->in_memory == MAP_IN_MEMORY)
1564 clean_object (op);
1565
1566 op->destroy (); 1469 op->destroy ();
1567 } 1470 }
1568 } 1471 }
1569} 1472}
1570 1473
1571/* 1474/*
1572 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1573 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1574 */ 1477 */
1575
1576void 1478void
1577free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1578{ 1480{
1579 int i; 1481 if (m->in_memory != MAP_IN_MEMORY)
1580
1581 if (!m->in_memory)
1582 {
1583 LOG (llevError, "Trying to free freed map.\n");
1584 return; 1482 return;
1585 } 1483
1484 m->in_memory = MAP_SAVING;
1485
1486 // TODO: use new/delete
1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1488
1586 if (flag && m->spaces) 1489 if (flag && m->spaces)
1587 free_all_objects (m); 1490 free_all_objects (m);
1588 if (m->name) 1491 if (m->name)
1589 FREE_AND_CLEAR (m->name); 1492 FREE_AND_CLEAR (m->name);
1590 if (m->spaces) 1493 if (m->spaces)
1591 FREE_AND_CLEAR (m->spaces); 1494 FREE_AND_CLEAR (m->spaces);
1592 if (m->msg) 1495 if (m->msg)
1593 FREE_AND_CLEAR (m->msg); 1496 FREE_AND_CLEAR (m->msg);
1594 if (m->maplore) 1497 if (m->maplore)
1595 FREE_AND_CLEAR (m->maplore); 1498 FREE_AND_CLEAR (m->maplore);
1596 if (m->shopitems) 1499
1597 delete[]m->shopitems; 1500 delete [] m->shopitems;
1598 m->shopitems = 0; 1501 m->shopitems = 0;
1502
1599 if (m->shoprace) 1503 if (m->shoprace)
1600 FREE_AND_CLEAR (m->shoprace); 1504 FREE_AND_CLEAR (m->shoprace);
1505
1601 if (m->buttons) 1506 if (m->buttons)
1602 free_objectlinkpt (m->buttons); 1507 free_objectlinkpt (m->buttons);
1508
1603 m->buttons = NULL; 1509 m->buttons = NULL;
1510
1604 for (i = 0; i < 4; i++) 1511 for (int i = 0; i < 4; i++)
1605 { 1512 {
1606 if (m->tile_path[i]) 1513 if (m->tile_path[i])
1607 FREE_AND_CLEAR (m->tile_path[i]); 1514 FREE_AND_CLEAR (m->tile_path[i]);
1515
1608 m->tile_map[i] = NULL; 1516 m->tile_map[i] = 0;
1609 } 1517 }
1518
1610 m->in_memory = MAP_SWAPPED; 1519 m->in_memory = MAP_SWAPPED;
1611}
1612 1520
1613/* 1521#undef FREE_AND_CLEAR
1614 * function: vanish maptile 1522}
1615 * m : pointer to maptile, if NULL no action 1523
1616 * this deletes all the data on the map (freeing pointers) 1524maptile::~maptile ()
1617 * and then removes this map from the global linked list of maps. 1525{
1526 free_map (this, 1);
1527 free (tmpname);
1528}
1529
1530void
1531maptile::do_destroy ()
1532{
1533 attachable::do_destroy ();
1534
1535 free_all_objects (this);
1536
1537 /* We need to look through all the maps and see if any maps
1538 * are pointing at this one for tiling information. Since
1539 * tiling can be asymetric, we just can not look to see which
1540 * maps this map tiles with and clears those.
1618 */ 1541 */
1542 //TODO: non-euclidean-tiling MUST GO
1543 for (maptile *m = first_map; m; m = m->next)
1544 for (int i = 0; i < 4; i++)
1545 if (m->tile_map[i] == this)
1546 m->tile_map[i] = 0;
1619 1547
1548 if (first_map == this)
1549 first_map = next;
1550 else
1551 for (maptile *m = first_map; m; m = m->next)
1552 if (m->next = this)
1553 {
1554 m->next = next;
1555 break;
1556 }
1557}
1558
1559//TODO: must go
1620void 1560void
1621delete_map (maptile *m) 1561delete_map (maptile *m)
1622{ 1562{
1623 maptile *tmp, *last;
1624 int i;
1625
1626 if (!m) 1563 if (m)
1627 return; 1564 m->destroy ();
1628
1629 m->clear ();
1630
1631 if (m->in_memory == MAP_IN_MEMORY)
1632 {
1633 /* change to MAP_SAVING, even though we are not,
1634 * so that remove_ob doesn't do as much work.
1635 */
1636 m->in_memory = MAP_SAVING;
1637 free_map (m, 1);
1638 }
1639 /* move this out of free_map, since tmpname can still be needed if
1640 * the map is swapped out.
1641 */
1642 if (m->tmpname)
1643 {
1644 free (m->tmpname);
1645 m->tmpname = NULL;
1646 }
1647 last = NULL;
1648 /* We need to look through all the maps and see if any maps
1649 * are pointing at this one for tiling information. Since
1650 * tiling can be assymetric, we just can not look to see which
1651 * maps this map tiles with and clears those.
1652 */
1653 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1654 {
1655 if (tmp->next == m)
1656 last = tmp;
1657
1658 /* This should hopefully get unrolled on a decent compiler */
1659 for (i = 0; i < 4; i++)
1660 if (tmp->tile_map[i] == m)
1661 tmp->tile_map[i] = NULL;
1662 }
1663
1664 /* If last is null, then this should be the first map in the list */
1665 if (!last)
1666 {
1667 if (m == first_map)
1668 first_map = m->next;
1669 else
1670 /* m->path is a static char, so should hopefully still have
1671 * some useful data in it.
1672 */
1673 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1674 }
1675 else
1676 last->next = m->next;
1677
1678 delete m;
1679} 1565}
1680
1681
1682 1566
1683/* 1567/*
1684 * Makes sure the given map is loaded and swapped in. 1568 * Makes sure the given map is loaded and swapped in.
1685 * name is path name of the map. 1569 * name is path name of the map.
1686 * flags meaning: 1570 * flags meaning:
… …
1689 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. 1573 * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player.
1690 * dont do any more name translation on it. 1574 * dont do any more name translation on it.
1691 * 1575 *
1692 * Returns a pointer to the given map. 1576 * Returns a pointer to the given map.
1693 */ 1577 */
1694
1695maptile * 1578maptile *
1696ready_map_name (const char *name, int flags) 1579ready_map_name (const char *name, int flags)
1697{ 1580{
1698 maptile *m;
1699
1700 if (!name) 1581 if (!name)
1701 return (NULL); 1582 return 0;
1702 1583
1703 /* Have we been at this level before? */ 1584 /* Have we been at this level before? */
1704 m = has_been_loaded (name); 1585 maptile *m = has_been_loaded (name);
1705 1586
1706 /* Map is good to go, so just return it */ 1587 /* Map is good to go, so just return it */
1707 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) 1588 if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY))
1708 {
1709 return m; 1589 return m;
1710 }
1711 1590
1712 /* unique maps always get loaded from their original location, and never 1591 /* unique maps always get loaded from their original location, and never
1713 * a temp location. Likewise, if map_flush is set, or we have never loaded 1592 * a temp location. Likewise, if map_flush is set, or we have never loaded
1714 * this map, load it now. I removed the reset checking from here - 1593 * this map, load it now. I removed the reset checking from here -
1715 * it seems the probability of a player trying to enter a map that should 1594 * it seems the probability of a player trying to enter a map that should
… …
1717 * a bit cleaner (and players probably shouldn't rely on exact timing for 1596 * a bit cleaner (and players probably shouldn't rely on exact timing for
1718 * resets in any case - if they really care, they should use the 'maps command. 1597 * resets in any case - if they really care, they should use the 'maps command.
1719 */ 1598 */
1720 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1599 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1721 { 1600 {
1722
1723 /* first visit or time to reset */ 1601 /* first visit or time to reset */
1724 if (m) 1602 if (m)
1725 { 1603 {
1726 clean_tmp_map (m); /* Doesn't make much difference */ 1604 clean_tmp_map (m); /* Doesn't make much difference */
1727 delete_map (m); 1605 delete_map (m);
… …
1820 { 1698 {
1821 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); 1699 LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m));
1822 return MAP_DIFFICULTY (m); 1700 return MAP_DIFFICULTY (m);
1823 } 1701 }
1824 1702
1825 for (x = 0; x < MAP_WIDTH (m); x++) 1703 for (x = 0; x < m->width; x++)
1826 for (y = 0; y < MAP_HEIGHT (m); y++) 1704 for (y = 0; y < m->height; y++)
1827 for (op = get_map_ob (m, x, y); op != NULL; op = op->above) 1705 for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above)
1828 { 1706 {
1829 if (QUERY_FLAG (op, FLAG_MONSTER)) 1707 if (QUERY_FLAG (op, FLAG_MONSTER))
1830 { 1708 {
1831 total_exp += op->stats.exp; 1709 total_exp += op->stats.exp;
1832 monster_cnt++; 1710 monster_cnt++;
… …
1925 /* All clients need to get re-updated for the change */ 1803 /* All clients need to get re-updated for the change */
1926 update_all_map_los (m); 1804 update_all_map_los (m);
1927 return 1; 1805 return 1;
1928} 1806}
1929 1807
1930
1931/* 1808/*
1932 * This function updates various attributes about a specific space 1809 * This function updates various attributes about a specific space
1933 * on the map (what it looks like, whether it blocks magic, 1810 * on the map (what it looks like, whether it blocks magic,
1934 * has a living creatures, prevents people from passing 1811 * has a living creatures, prevents people from passing
1935 * through, etc) 1812 * through, etc)
1936 */ 1813 */
1937void 1814void
1938update_position (maptile *m, int x, int y) 1815mapspace::update_ ()
1939{ 1816{
1940 object *tmp, *last = NULL; 1817 object *tmp, *last = 0;
1941 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1818 uint8 flags = 0, light = 0, anywhere = 0;
1942 New_Face *top, *floor, *middle; 1819 New_Face *top, *floor, *middle;
1943 object *top_obj, *floor_obj, *middle_obj; 1820 object *top_obj, *floor_obj, *middle_obj;
1944 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1821 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1945 1822
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; 1823 middle = blank_face;
1954 top = blank_face; 1824 top = blank_face;
1955 floor = blank_face; 1825 floor = blank_face;
1956 1826
1957 middle_obj = NULL; 1827 middle_obj = 0;
1958 top_obj = NULL; 1828 top_obj = 0;
1959 floor_obj = NULL; 1829 floor_obj = 0;
1960 1830
1961 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1962 { 1832 {
1963
1964 /* This could be made additive I guess (two lights better than 1833 /* This could be made additive I guess (two lights better than
1965 * one). But if so, it shouldn't be a simple additive - 2 1834 * one). But if so, it shouldn't be a simple additive - 2
1966 * light bulbs do not illuminate twice as far as once since 1835 * light bulbs do not illuminate twice as far as once since
1967 * it is a disapation factor that is squared (or is it cubed?) 1836 * it is a dissapation factor that is cubed.
1968 */ 1837 */
1969 if (tmp->glow_radius > light) 1838 if (tmp->glow_radius > light)
1970 light = tmp->glow_radius; 1839 light = tmp->glow_radius;
1971 1840
1972 /* This call is needed in order to update objects the player 1841 /* This call is needed in order to update objects the player
… …
2010 { 1879 {
2011 middle = tmp->face; 1880 middle = tmp->face;
2012 middle_obj = tmp; 1881 middle_obj = tmp;
2013 } 1882 }
2014 } 1883 }
1884
2015 if (tmp == tmp->above) 1885 if (tmp == tmp->above)
2016 { 1886 {
2017 LOG (llevError, "Error in structure of map\n"); 1887 LOG (llevError, "Error in structure of map\n");
2018 exit (-1); 1888 exit (-1);
2019 } 1889 }
2020 1890
2021 move_slow |= tmp->move_slow; 1891 move_slow |= tmp->move_slow;
2022 move_block |= tmp->move_block; 1892 move_block |= tmp->move_block;
2023 move_on |= tmp->move_on; 1893 move_on |= tmp->move_on;
2024 move_off |= tmp->move_off; 1894 move_off |= tmp->move_off;
2025 move_allow |= tmp->move_allow; 1895 move_allow |= tmp->move_allow;
2026 1896
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)) 1897 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2037 flags |= P_BLOCKSVIEW; 1898 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2038 } /* for stack of objects */ 1899 if (tmp->type == PLAYER) flags |= P_PLAYER;
2039 1900 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2040 /* we don't want to rely on this function to have accurate flags, but 1901 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
2041 * since we're already doing the work, we calculate them here. 1902 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 { 1903 }
2046 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1904
2047 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1905 this->light = light;
2048 } 1906 this->flags_ = flags;
2049 SET_MAP_FLAGS (m, x, y, flags); 1907 this->move_block = move_block & ~move_allow;
2050 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1908 this->move_on = move_on;
2051 SET_MAP_MOVE_ON (m, x, y, move_on); 1909 this->move_off = move_off;
2052 SET_MAP_MOVE_OFF (m, x, y, move_off); 1910 this->move_slow = move_slow;
2053 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2054 1911
2055 /* At this point, we have a floor face (if there is a floor), 1912 /* 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 1913 * and the floor is set - we are not going to touch it at
2057 * this point. 1914 * this point.
2058 * middle contains the highest visibility face. 1915 * middle contains the highest visibility face.
… …
2112 break; 1969 break;
2113 } 1970 }
2114 } 1971 }
2115 } 1972 }
2116 } 1973 }
1974
2117 if (middle == floor) 1975 if (middle == floor)
2118 middle = blank_face; 1976 middle = blank_face;
1977
2119 if (top == middle) 1978 if (top == middle)
2120 middle = blank_face; 1979 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 1980
1981 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1982 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1983 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1984}
2139 1985
2140void 1986void
2141set_map_reset_time (maptile *map) 1987set_map_reset_time (maptile *map)
2142{ 1988{
2143 int timeout; 1989 int timeout;
… …
2145 timeout = MAP_RESET_TIMEOUT (map); 1991 timeout = MAP_RESET_TIMEOUT (map);
2146 if (timeout <= 0) 1992 if (timeout <= 0)
2147 timeout = MAP_DEFAULTRESET; 1993 timeout = MAP_DEFAULTRESET;
2148 if (timeout >= MAP_MAXRESET) 1994 if (timeout >= MAP_MAXRESET)
2149 timeout = MAP_MAXRESET; 1995 timeout = MAP_MAXRESET;
2150 MAP_WHEN_RESET (map) = seconds () + timeout; 1996 MAP_WHEN_RESET (map) = time (0) + timeout;
2151} 1997}
2152 1998
2153/* this updates the orig_map->tile_map[tile_num] value after loading 1999/* 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 2000 * 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 2001 * maps tile_map values if it tiles back to this one. It returns
… …
2183 * 2029 *
2184 */ 2030 */
2185int 2031int
2186out_of_map (maptile *m, int x, int y) 2032out_of_map (maptile *m, int x, int y)
2187{ 2033{
2188
2189 /* If we get passed a null map, this is obviously the 2034 /* If we get passed a null map, this is obviously the
2190 * case. This generally shouldn't happen, but if the 2035 * case. This generally shouldn't happen, but if the
2191 * map loads fail below, it could happen. 2036 * map loads fail below, it could happen.
2192 */ 2037 */
2193 if (!m) 2038 if (!m)
… …
2195 2040
2196 if (x < 0) 2041 if (x < 0)
2197 { 2042 {
2198 if (!m->tile_path[3]) 2043 if (!m->tile_path[3])
2199 return 1; 2044 return 1;
2045
2200 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2046 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2201 {
2202 load_and_link_tiled_map (m, 3); 2047 load_and_link_tiled_map (m, 3);
2203 } 2048
2204 return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); 2049 return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y));
2205 } 2050 }
2206 if (x >= MAP_WIDTH (m)) 2051
2052 if (x >= m->width)
2207 { 2053 {
2208 if (!m->tile_path[1]) 2054 if (!m->tile_path[1])
2209 return 1; 2055 return 1;
2056
2210 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2057 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2211 {
2212 load_and_link_tiled_map (m, 1); 2058 load_and_link_tiled_map (m, 1);
2213 } 2059
2214 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2060 return (out_of_map (m->tile_map[1], x - m->width, y));
2215 } 2061 }
2062
2216 if (y < 0) 2063 if (y < 0)
2217 { 2064 {
2218 if (!m->tile_path[0]) 2065 if (!m->tile_path[0])
2219 return 1; 2066 return 1;
2067
2220 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2068 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2221 {
2222 load_and_link_tiled_map (m, 0); 2069 load_and_link_tiled_map (m, 0);
2223 } 2070
2224 return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); 2071 return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height));
2225 } 2072 }
2226 if (y >= MAP_HEIGHT (m)) 2073
2074 if (y >= m->height)
2227 { 2075 {
2228 if (!m->tile_path[2]) 2076 if (!m->tile_path[2])
2229 return 1; 2077 return 1;
2078
2230 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2079 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2231 {
2232 load_and_link_tiled_map (m, 2); 2080 load_and_link_tiled_map (m, 2);
2233 } 2081
2234 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2082 return (out_of_map (m->tile_map[2], x, y - m->height));
2235 } 2083 }
2236 2084
2237 /* Simple case - coordinates are within this local 2085 /* Simple case - coordinates are within this local
2238 * map. 2086 * map.
2239 */ 2087 */
… …
2253{ 2101{
2254 2102
2255 if (*x < 0) 2103 if (*x < 0)
2256 { 2104 {
2257 if (!m->tile_path[3]) 2105 if (!m->tile_path[3])
2258 return NULL; 2106 return 0;
2259 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 2107 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
2260 load_and_link_tiled_map (m, 3); 2108 load_and_link_tiled_map (m, 3);
2261 2109
2262 *x += MAP_WIDTH (m->tile_map[3]); 2110 *x += m->tile_map[3]->width;
2263 return (get_map_from_coord (m->tile_map[3], x, y)); 2111 return (get_map_from_coord (m->tile_map[3], x, y));
2264 } 2112 }
2265 if (*x >= MAP_WIDTH (m)) 2113
2114 if (*x >= m->width)
2266 { 2115 {
2267 if (!m->tile_path[1]) 2116 if (!m->tile_path[1])
2268 return NULL; 2117 return 0;
2118
2269 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 2119 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
2270 load_and_link_tiled_map (m, 1); 2120 load_and_link_tiled_map (m, 1);
2271 2121
2272 *x -= MAP_WIDTH (m); 2122 *x -= m->width;
2273 return (get_map_from_coord (m->tile_map[1], x, y)); 2123 return (get_map_from_coord (m->tile_map[1], x, y));
2274 } 2124 }
2125
2275 if (*y < 0) 2126 if (*y < 0)
2276 { 2127 {
2277 if (!m->tile_path[0]) 2128 if (!m->tile_path[0])
2278 return NULL; 2129 return 0;
2130
2279 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 2131 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
2280 load_and_link_tiled_map (m, 0); 2132 load_and_link_tiled_map (m, 0);
2281 2133
2282 *y += MAP_HEIGHT (m->tile_map[0]); 2134 *y += m->tile_map[0]->height;
2283 return (get_map_from_coord (m->tile_map[0], x, y)); 2135 return (get_map_from_coord (m->tile_map[0], x, y));
2284 } 2136 }
2285 if (*y >= MAP_HEIGHT (m)) 2137
2138 if (*y >= m->height)
2286 { 2139 {
2287 if (!m->tile_path[2]) 2140 if (!m->tile_path[2])
2288 return NULL; 2141 return 0;
2142
2289 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 2143 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
2290 load_and_link_tiled_map (m, 2); 2144 load_and_link_tiled_map (m, 2);
2291 2145
2292 *y -= MAP_HEIGHT (m); 2146 *y -= m->height;
2293 return (get_map_from_coord (m->tile_map[2], x, y)); 2147 return (get_map_from_coord (m->tile_map[2], x, y));
2294 } 2148 }
2295 2149
2296 /* Simple case - coordinates are within this local 2150 /* Simple case - coordinates are within this local
2297 * map. 2151 * map.
… …
2317 2171
2318 } 2172 }
2319 else if (map1->tile_map[0] == map2) 2173 else if (map1->tile_map[0] == map2)
2320 { /* up */ 2174 { /* up */
2321 *dx = 0; 2175 *dx = 0;
2322 *dy = -MAP_HEIGHT (map2); 2176 *dy = -map2->height;
2323 } 2177 }
2324 else if (map1->tile_map[1] == map2) 2178 else if (map1->tile_map[1] == map2)
2325 { /* right */ 2179 { /* right */
2326 *dx = MAP_WIDTH (map1); 2180 *dx = map1->width;
2327 *dy = 0; 2181 *dy = 0;
2328 } 2182 }
2329 else if (map1->tile_map[2] == map2) 2183 else if (map1->tile_map[2] == map2)
2330 { /* down */ 2184 { /* down */
2331 *dx = 0; 2185 *dx = 0;
2332 *dy = MAP_HEIGHT (map1); 2186 *dy = map1->height;
2333 } 2187 }
2334 else if (map1->tile_map[3] == map2) 2188 else if (map1->tile_map[3] == map2)
2335 { /* left */ 2189 { /* left */
2336 *dx = -MAP_WIDTH (map2); 2190 *dx = -map2->width;
2337 *dy = 0; 2191 *dy = 0;
2338 2192
2339 } 2193 }
2340 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 2194 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2)
2341 { /* up right */ 2195 { /* up right */
2342 *dx = MAP_WIDTH (map1->tile_map[0]); 2196 *dx = map1->tile_map[0]->width;
2343 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2197 *dy = -map1->tile_map[0]->height;
2344 } 2198 }
2345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 2199 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2)
2346 { /* up left */ 2200 { /* up left */
2347 *dx = -MAP_WIDTH (map2); 2201 *dx = -map2->width;
2348 *dy = -MAP_HEIGHT (map1->tile_map[0]); 2202 *dy = -map1->tile_map[0]->height;
2349 } 2203 }
2350 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 2204 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2)
2351 { /* right up */ 2205 { /* right up */
2352 *dx = MAP_WIDTH (map1); 2206 *dx = map1->width;
2353 *dy = -MAP_HEIGHT (map2); 2207 *dy = -map2->height;
2354 } 2208 }
2355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 2209 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2)
2356 { /* right down */ 2210 { /* right down */
2357 *dx = MAP_WIDTH (map1); 2211 *dx = map1->width;
2358 *dy = MAP_HEIGHT (map1->tile_map[1]); 2212 *dy = map1->tile_map[1]->height;
2359 } 2213 }
2360 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 2214 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2)
2361 { /* down right */ 2215 { /* down right */
2362 *dx = MAP_WIDTH (map1->tile_map[2]); 2216 *dx = map1->tile_map[2]->width;
2363 *dy = MAP_HEIGHT (map1); 2217 *dy = map1->height;
2364 } 2218 }
2365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 2219 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2)
2366 { /* down left */ 2220 { /* down left */
2367 *dx = -MAP_WIDTH (map2); 2221 *dx = -map2->width;
2368 *dy = MAP_HEIGHT (map1); 2222 *dy = map1->height;
2369 } 2223 }
2370 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 2224 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2)
2371 { /* left up */ 2225 { /* left up */
2372 *dx = -MAP_WIDTH (map1->tile_map[3]); 2226 *dx = -map1->tile_map[3]->width;
2373 *dy = -MAP_HEIGHT (map2); 2227 *dy = -map2->height;
2374 } 2228 }
2375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 2229 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2)
2376 { /* left down */ 2230 { /* left down */
2377 *dx = -MAP_WIDTH (map1->tile_map[3]); 2231 *dx = -map1->tile_map[3]->width;
2378 *dy = MAP_HEIGHT (map1->tile_map[3]); 2232 *dy = map1->tile_map[3]->height;
2379 2233
2380 } 2234 }
2381 else 2235 else
2382 { /* not "adjacent" enough */ 2236 { /* not "adjacent" enough */
2383 return 0; 2237 return 0;

Diff Legend

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