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.33 by root, Sun Oct 8 16:51:50 2006 UTC vs.
Revision 1.46 by root, Wed Dec 20 11:36:38 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
… …
231void 222void
232dump_all_maps (void) 223dump_all_maps (void)
233{ 224{
234 maptile *m; 225 maptile *m;
235 226
236 for (m = first_map; m != NULL; m = m->next) 227 for (m = first_map; m; m = m->next)
237 {
238 dump_map (m); 228 dump_map (m);
239 }
240} 229}
241 230
242/* This rolls up wall, blocks_magic, blocks_view, etc, all into 231/* This rolls up wall, blocks_magic, blocks_view, etc, all into
243 * one function that just returns a P_.. value (see map.h) 232 * one function that just returns a P_.. value (see map.h)
244 * it will also do map translation for tiled maps, returning 233 * it will also do map translation for tiled maps, returning
… …
248 * 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
249 * checking for the existence of something on those spaces, but 238 * checking for the existence of something on those spaces, but
250 * don't expect to insert/remove anything from those spaces. 239 * don't expect to insert/remove anything from those spaces.
251 */ 240 */
252int 241int
253get_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)
254{ 243{
255 sint16 newx, newy; 244 sint16 newx, newy;
256 int retval = 0; 245 int retval = 0;
257 maptile *mp; 246 maptile *mp;
258 247
259 if (out_of_map (oldmap, x, y))
260 return P_OUT_OF_MAP;
261 newx = x; 248 newx = x;
262 newy = y; 249 newy = y;
250
263 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
264 if (mp != oldmap) 256 if (mp != oldmap)
265 retval |= P_NEW_MAP; 257 retval |= P_NEW_MAP;
266 if (newmap)
267 *newmap = mp;
268 if (nx)
269 *nx = newx;
270 if (ny)
271 *ny = newy;
272 258
273 retval |= mp->spaces[newx + mp->width * newy].flags; 259 if (newmap) *newmap = mp;
260 if (nx) *nx = newx;
261 if (ny) *ny = newy;
274 262
275 return retval; 263 return retval | mp->at (newx, newy).flags ();
276} 264}
277 265
278/* 266/*
279 * Returns true if the given coordinate is blocked except by the 267 * Returns true if the given coordinate is blocked except by the
280 * object passed is not blocking. This is used with 268 * object passed is not blocking. This is used with
… …
303 } 291 }
304 292
305 /* 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
306 * directly. 294 * directly.
307 */ 295 */
308 mflags = m->spaces[sx + m->width * sy].flags; 296 mflags = m->at (sx, sy).flags ();
309 297
310 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 298 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);
311 299
312 /* If space is currently not blocked by anything, no need to 300 /* If space is currently not blocked by anything, no need to
313 * go further. Not true for players - all sorts of special 301 * go further. Not true for players - all sorts of special
… …
332 /* 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
333 * 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
334 * true. If we get through the entire stack, that must mean 322 * true. If we get through the entire stack, that must mean
335 * ob is blocking it, so return 0. 323 * ob is blocking it, so return 0.
336 */ 324 */
337 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)
338 { 326 {
339 327
340 /* This must be before the checks below. Code for inventory checkers. */ 328 /* This must be before the checks below. Code for inventory checkers. */
341 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) 329 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
342 { 330 {
… …
406 * 394 *
407 * Note this used to be arch_blocked, but with new movement 395 * Note this used to be arch_blocked, but with new movement
408 * 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
409 * against the move_block values. 397 * against the move_block values.
410 */ 398 */
411
412int 399int
413ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 400ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y)
414{ 401{
415 archetype *tmp; 402 archetype *tmp;
416 int flag; 403 int flag;
… …
446 433
447 /* 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
448 * head of the object should correspond for the entire object. 435 * head of the object should correspond for the entire object.
449 */ 436 */
450 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)))
451 return AB_NO_PASS; 438 return P_NO_PASS;
452
453 } 439 }
440
454 return 0; 441 return 0;
455} 442}
456 443
457/* 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
458 * 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
… …
495 object *tmp, *op, *last, *above; 482 object *tmp, *op, *last, *above;
496 archetype *at; 483 archetype *at;
497 484
498 for (x = 0; x < MAP_WIDTH (m); x++) 485 for (x = 0; x < MAP_WIDTH (m); x++)
499 for (y = 0; y < MAP_HEIGHT (m); y++) 486 for (y = 0; y < MAP_HEIGHT (m); y++)
500 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)
501 { 488 {
502 above = tmp->above; 489 above = tmp->above;
503 490
504 /* already multipart - don't do anything more */ 491 /* already multipart - don't do anything more */
505 if (tmp->head || tmp->more) 492 if (tmp->head || tmp->more)
… …
540{ 527{
541 int i, j; 528 int i, j;
542 int unique; 529 int unique;
543 object *op, *prev = NULL, *last_more = NULL, *otmp; 530 object *op, *prev = NULL, *last_more = NULL, *otmp;
544 531
545 op = get_object (); 532 op = object::create ();
546 op->map = m; /* To handle buttons correctly */ 533 op->map = m; /* To handle buttons correctly */
547 534
548 while ((i = load_object (fp, op, mapflags))) 535 while ((i = load_object (fp, op, mapflags)))
549 { 536 {
550 /* if the archetype for the object is null, means that we 537 /* if the archetype for the object is null, means that we
… …
558 } 545 }
559 546
560 547
561 switch (i) 548 switch (i)
562 { 549 {
563 case LL_NORMAL: 550 case LL_NORMAL:
564 /* 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 */
565 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)
566 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);
567 else 554 else
568 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);
569 556
570 if (op->inv) 557 if (op->inv)
571 sum_weight (op); 558 sum_weight (op);
572 559
573 prev = op, last_more = op; 560 prev = op, last_more = op;
574 break; 561 break;
575 562
576 case LL_MORE: 563 case LL_MORE:
577 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);
578 op->head = prev, last_more->more = op, last_more = op; 565 op->head = prev, last_more->more = op, last_more = op;
579 break; 566 break;
580 } 567 }
581 568
582 if (mapflags & MAP_STYLE) 569 if (mapflags & MAP_STYLE)
583 remove_from_active_list (op); 570 remove_from_active_list (op);
584 571
585 op = get_object (); 572 op = object::create ();
586 op->map = m; 573 op->map = m;
587 } 574 }
588 575
589 for (i = 0; i < m->width; i++) 576 for (i = 0; i < m->width; i++)
590 { 577 {
591 for (j = 0; j < m->height; j++) 578 for (j = 0; j < m->height; j++)
592 { 579 {
593 unique = 0; 580 unique = 0;
594 /* check for unique items, or unique squares */ 581 /* check for unique items, or unique squares */
595 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)
596 { 583 {
597 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))
598 unique = 1; 585 unique = 1;
586
599 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 587 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
600 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 588 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
601 } 589 }
602 } 590 }
603 } 591 }
604 592
605 free_object (op); 593 op->destroy ();
606 link_multipart_objects (m); 594 link_multipart_objects (m);
607} 595}
608 596
609/* This saves all the objects on the map in a non destructive fashion. 597/* 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, 598 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
… …
620 /* first pass - save one-part objects */ 608 /* first pass - save one-part objects */
621 for (i = 0; i < MAP_WIDTH (m); i++) 609 for (i = 0; i < MAP_WIDTH (m); i++)
622 for (j = 0; j < MAP_HEIGHT (m); j++) 610 for (j = 0; j < MAP_HEIGHT (m); j++)
623 { 611 {
624 unique = 0; 612 unique = 0;
625 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)
626 { 614 {
627 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))
628 unique = 1; 616 unique = 1;
629 617
630 if (op->type == PLAYER) 618 if (op->type == PLAYER)
631 {
632 LOG (llevDebug, "Player on map that is being saved\n");
633 continue; 619 continue;
634 }
635 620
636 if (op->head || op->owner) 621 if (op->head || op->owner)
637 continue; 622 continue;
638 623
639 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 624 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
640 save_object (fp2, op, 3); 625 save_object (fp2, op, 3);
641 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))))
642 save_object (fp, op, 3); 627 save_object (fp, op, 3);
628 }
629 }
630}
643 631
644 } /* for this space */ 632maptile::maptile ()
645 } /* for this j */ 633{
634 in_memory = MAP_SWAPPED;
635 /* The maps used to pick up default x and y values from the
636 * map archetype. Mimic that behaviour.
637 */
638 MAP_WIDTH (this) = 16;
639 MAP_HEIGHT (this) = 16;
640 MAP_RESET_TIMEOUT (this) = 0;
641 MAP_TIMEOUT (this) = 300;
642 MAP_ENTER_X (this) = 0;
643 MAP_ENTER_Y (this) = 0;
644 /*set part to -1 indicating conversion to weather map not yet done */
645 MAP_WORLDPARTX (this) = -1;
646 MAP_WORLDPARTY (this) = -1;
646} 647}
647 648
648/* 649/*
649 * Allocates, initialises, and returns a pointer to a maptile. 650 * Allocates, initialises, and returns a pointer to a maptile.
650 * Modified to no longer take a path option which was not being 651 * Modified to no longer take a path option which was not being
651 * used anyways. MSW 2001-07-01 652 * used anyways. MSW 2001-07-01
652 */ 653 */
653
654maptile * 654maptile *
655get_linked_map (void) 655get_linked_map (void)
656{ 656{
657 maptile *map = new maptile; 657 maptile *mp, *map = new maptile;
658 maptile *mp;
659 658
660 for (mp = first_map; mp != NULL && mp->next != NULL; mp = mp->next); 659 for (mp = first_map; mp && mp->next; mp = mp->next);
660
661 if (mp == NULL) 661 if (mp == NULL)
662 first_map = map; 662 first_map = map;
663 else 663 else
664 mp->next = map; 664 mp->next = map;
665 665
666 map->in_memory = MAP_SWAPPED;
667 /* The maps used to pick up default x and y values from the
668 * map archetype. Mimic that behaviour.
669 */
670 MAP_WIDTH (map) = 16;
671 MAP_HEIGHT (map) = 16;
672 MAP_RESET_TIMEOUT (map) = 0;
673 MAP_TIMEOUT (map) = 300;
674 MAP_ENTER_X (map) = 0;
675 MAP_ENTER_Y (map) = 0;
676 /*set part to -1 indicating conversion to weather map not yet done */
677 MAP_WORLDPARTX (map) = -1;
678 MAP_WORLDPARTY (map) = -1;
679 return map; 666 return map;
680} 667}
681 668
682/* 669/*
683 * Allocates the arrays contained in a maptile. 670 * Allocates the arrays contained in a maptile.
684 * This basically allocates the dynamic array of spaces for the 671 * This basically allocates the dynamic array of spaces for the
685 * map. 672 * map.
686 */ 673 */
687
688void 674void
689allocate_map (maptile *m) 675maptile::allocate ()
690{ 676{
691 m->in_memory = MAP_IN_MEMORY; 677 in_memory = MAP_IN_MEMORY;
678
692 /* Log this condition and free the storage. We could I suppose 679 /* Log this condition and free the storage. We could I suppose
693 * realloc, but if the caller is presuming the data will be intact, 680 * realloc, but if the caller is presuming the data will be intact,
694 * that is their poor assumption. 681 * that is their poor assumption.
695 */ 682 */
696 if (m->spaces) 683 if (spaces)
697 { 684 {
698 LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path); 685 LOG (llevError, "allocate_map called with already allocated map (%s)\n", path);
699 free (m->spaces); 686 free (spaces);
700 } 687 }
701 688
702 m->spaces = (MapSpace *) calloc (1, MAP_WIDTH (m) * MAP_HEIGHT (m) * sizeof (MapSpace)); 689 spaces = (mapspace *)
690 calloc (1, width * height * sizeof (mapspace));
703 691
704 if (m->spaces == NULL) 692 if (!spaces)
705 fatal (OUT_OF_MEMORY); 693 fatal (OUT_OF_MEMORY);
706} 694}
707 695
708/* Create and returns a map of the specific size. Used 696/* Create and returns a map of the specific size. Used
709 * in random map code and the editor. 697 * in random map code and the editor.
… …
714 maptile *m = get_linked_map (); 702 maptile *m = get_linked_map ();
715 703
716 m->width = sizex; 704 m->width = sizex;
717 m->height = sizey; 705 m->height = sizey;
718 m->in_memory = MAP_SWAPPED; 706 m->in_memory = MAP_SWAPPED;
719 allocate_map (m); 707 m->allocate ();
708
720 return m; 709 return m;
721} 710}
722 711
723/* Takes a string from a map definition and outputs a pointer to the array of shopitems 712/* Takes a string from a map definition and outputs a pointer to the array of shopitems
724 * corresponding to that string. Memory is allocated for this, it must be freed 713 * corresponding to that string. Memory is allocated for this, it must be freed
… …
732 char *shop_string, *p, *q, *next_semicolon, *next_colon; 721 char *shop_string, *p, *q, *next_semicolon, *next_colon;
733 shopitems *items = NULL; 722 shopitems *items = NULL;
734 int i = 0, number_of_entries = 0; 723 int i = 0, number_of_entries = 0;
735 const typedata *current_type; 724 const typedata *current_type;
736 725
737 shop_string = strdup_local (input_string); 726 shop_string = strdup (input_string);
738 p = shop_string; 727 p = shop_string;
739 /* 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 */
740 while (p) 729 while (p)
741 { 730 {
742 p = strchr (p, ';'); 731 p = strchr (p, ';');
… …
851{ 840{
852 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; 841 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
853 int msgpos = 0; 842 int msgpos = 0;
854 int maplorepos = 0; 843 int maplorepos = 0;
855 844
856 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 845 while (fgets (buf, HUGE_BUF, fp) != NULL)
857 { 846 {
858 buf[HUGE_BUF - 1] = 0; 847 buf[HUGE_BUF - 1] = 0;
859 key = buf; 848 key = buf;
849
860 while (isspace (*key)) 850 while (isspace (*key))
861 key++; 851 key++;
852
862 if (*key == 0) 853 if (*key == 0)
863 continue; /* empty line */ 854 continue; /* empty line */
855
864 value = strchr (key, ' '); 856 value = strchr (key, ' ');
857
865 if (!value) 858 if (!value)
866 { 859 {
867 end = strchr (key, '\n'); 860 if ((end = strchr (key, '\n')))
868 if (end != NULL)
869 {
870 *end = 0; 861 *end = 0;
871 }
872 } 862 }
873 else 863 else
874 { 864 {
875 *value = 0; 865 *value = 0;
876 value++; 866 value++;
877 end = strchr (value, '\n'); 867 end = strchr (value, '\n');
868
878 while (isspace (*value)) 869 while (isspace (*value))
879 { 870 {
880 value++; 871 value++;
872
881 if (*value == '\0' || value == end) 873 if (*value == '\0' || value == end)
882 { 874 {
883 /* Nothing but spaces. */ 875 /* Nothing but spaces. */
884 value = NULL; 876 value = NULL;
885 break; 877 break;
… …
908 * that use the parameter. 900 * that use the parameter.
909 */ 901 */
910 902
911 if (!strcmp (key, "msg")) 903 if (!strcmp (key, "msg"))
912 { 904 {
913 while (fgets (buf, HUGE_BUF - 1, fp) != NULL) 905 while (fgets (buf, HUGE_BUF, fp) != NULL)
914 { 906 {
915 if (!strcmp (buf, "endmsg\n")) 907 if (!strcmp (buf, "endmsg\n"))
916 break; 908 break;
917 else 909 else
918 { 910 {
… …
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 - 1, fp) != NULL) 926 while (fgets (buf, HUGE_BUF, fp) != NULL)
935 { 927 {
936 if (!strcmp (buf, "endmaplore\n")) 928 if (!strcmp (buf, "endmaplore\n"))
937 break; 929 break;
938 else 930 else
939 { 931 {
… …
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
… …
1182 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); 1124 LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags);
1183 delete_map (m); 1125 delete_map (m);
1184 return NULL; 1126 return NULL;
1185 } 1127 }
1186 1128
1187 allocate_map (m); 1129 m->allocate ();
1188 1130
1189 m->in_memory = MAP_LOADING; 1131 m->in_memory = MAP_LOADING;
1190 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); 1132 load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE));
1191 1133
1192 m->in_memory = MAP_IN_MEMORY; 1134 m->in_memory = MAP_IN_MEMORY;
… …
1238 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname); 1180 LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname);
1239 delete_map (m); 1181 delete_map (m);
1240 m = load_original_map (m->path, 0); 1182 m = load_original_map (m->path, 0);
1241 return NULL; 1183 return NULL;
1242 } 1184 }
1185
1243 allocate_map (m); 1186 m->allocate ();
1244 1187
1245 m->in_memory = MAP_LOADING; 1188 m->in_memory = MAP_LOADING;
1246 load_objects (m, thawer, 0); 1189 load_objects (m, thawer, 0);
1247 1190
1248 m->in_memory = MAP_IN_MEMORY; 1191 m->in_memory = MAP_IN_MEMORY;
… …
1273 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); 1216 LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname);
1274 delete_map (m); 1217 delete_map (m);
1275 m = load_original_map (m->path, 0); 1218 m = load_original_map (m->path, 0);
1276 return NULL; 1219 return NULL;
1277 } 1220 }
1278 /*allocate_map(m); */ 1221 /*m->allocate ();*/
1279 1222
1280 m->in_memory = MAP_LOADING; 1223 m->in_memory = MAP_LOADING;
1281 load_objects (m, thawer, MAP_OVERLAY); 1224 load_objects (m, thawer, MAP_OVERLAY);
1282 1225
1283 m->in_memory = MAP_IN_MEMORY; 1226 m->in_memory = MAP_IN_MEMORY;
… …
1297 1240
1298 for (i = 0; i < MAP_WIDTH (m); i++) 1241 for (i = 0; i < MAP_WIDTH (m); i++)
1299 for (j = 0; j < MAP_HEIGHT (m); j++) 1242 for (j = 0; j < MAP_HEIGHT (m); j++)
1300 { 1243 {
1301 unique = 0; 1244 unique = 0;
1245
1302 for (op = get_map_ob (m, i, j); op; op = next) 1246 for (op = GET_MAP_OB (m, i, j); op; op = next)
1303 { 1247 {
1304 next = op->above; 1248 next = op->above;
1249
1305 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))
1306 unique = 1; 1251 unique = 1;
1252
1307 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1253 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1308 { 1254 {
1309 clean_object (op); 1255 clean_object (op);
1256
1310 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1257 if (QUERY_FLAG (op, FLAG_IS_LINKED))
1311 remove_button_link (op); 1258 remove_button_link (op);
1312 remove_ob (op); 1259
1313 free_object (op); 1260 op->destroy ();
1314 } 1261 }
1315 } 1262 }
1316 } 1263 }
1317} 1264}
1318 1265
… …
1387 make_path_to_file (filename); 1334 make_path_to_file (filename);
1388 } 1335 }
1389 else 1336 else
1390 { 1337 {
1391 if (!m->tmpname) 1338 if (!m->tmpname)
1392 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1339 m->tmpname = tempnam (settings.tmpdir, NULL);
1393 1340
1394 strcpy (filename, m->tmpname); 1341 strcpy (filename, m->tmpname);
1395 } 1342 }
1396 1343
1397 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1344 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1421 print_shop_string (m, shop); 1368 print_shop_string (m, shop);
1422 fprintf (freezer, "shopitems %s\n", shop); 1369 fprintf (freezer, "shopitems %s\n", shop);
1423 } 1370 }
1424 if (m->shopgreed) 1371 if (m->shopgreed)
1425 fprintf (freezer, "shopgreed %f\n", m->shopgreed); 1372 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1426#ifndef WIN32
1427 if (m->shopmin) 1373 if (m->shopmin)
1428 fprintf (freezer, "shopmin %llu\n", m->shopmin); 1374 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1429 if (m->shopmax) 1375 if (m->shopmax)
1430 fprintf (freezer, "shopmax %llu\n", m->shopmax); 1376 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1431#else
1432 if (m->shopmin)
1433 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1434 if (m->shopmax)
1435 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1436#endif
1437 if (m->shoprace) 1377 if (m->shoprace)
1438 fprintf (freezer, "shoprace %s\n", m->shoprace); 1378 fprintf (freezer, "shoprace %s\n", m->shoprace);
1439 if (m->darkness) 1379 if (m->darkness)
1440 fprintf (freezer, "darkness %d\n", m->darkness); 1380 fprintf (freezer, "darkness %d\n", m->darkness);
1441 if (m->width) 1381 if (m->width)
… …
1520 object *tmp, *next; 1460 object *tmp, *next;
1521 1461
1522 for (tmp = op->inv; tmp; tmp = next) 1462 for (tmp = op->inv; tmp; tmp = next)
1523 { 1463 {
1524 next = tmp->below; 1464 next = tmp->below;
1465
1525 clean_object (tmp); 1466 clean_object (tmp);
1526 if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) 1467 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1527 remove_button_link (tmp); 1468 remove_button_link (tmp);
1528 remove_ob (tmp); 1469
1529 free_object (tmp); 1470 tmp->destroy ();
1530 } 1471 }
1531} 1472}
1532 1473
1533/* 1474/*
1534 * Remove and free all objects in the given map. 1475 * Remove and free all objects in the given map.
… …
1550 if (op == previous_obj) 1491 if (op == previous_obj)
1551 { 1492 {
1552 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); 1493 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1553 break; 1494 break;
1554 } 1495 }
1496
1555 previous_obj = op; 1497 previous_obj = op;
1498
1556 if (op->head != NULL) 1499 if (op->head != NULL)
1557 op = op->head; 1500 op = op->head;
1558 1501
1559 /* If the map isn't in memory, free_object will remove and 1502 /* If the map isn't in memory, free_object will remove and
1560 * free objects in op's inventory. So let it do the job. 1503 * free objects in op's inventory. So let it do the job.
1561 */ 1504 */
1562 if (m->in_memory == MAP_IN_MEMORY) 1505 if (m->in_memory == MAP_IN_MEMORY)
1563 clean_object (op); 1506 clean_object (op);
1564 remove_ob (op); 1507
1565 free_object (op); 1508 op->destroy ();
1566 } 1509 }
1567 } 1510 }
1568} 1511}
1569 1512
1570/* 1513/*
… …
1580 if (!m->in_memory) 1523 if (!m->in_memory)
1581 { 1524 {
1582 LOG (llevError, "Trying to free freed map.\n"); 1525 LOG (llevError, "Trying to free freed map.\n");
1583 return; 1526 return;
1584 } 1527 }
1528
1529 // TODO: use new/delete
1530#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1531
1585 if (flag && m->spaces) 1532 if (flag && m->spaces)
1586 free_all_objects (m); 1533 free_all_objects (m);
1587 if (m->name) 1534 if (m->name)
1588 FREE_AND_CLEAR (m->name); 1535 FREE_AND_CLEAR (m->name);
1589 if (m->spaces) 1536 if (m->spaces)
1590 FREE_AND_CLEAR (m->spaces); 1537 FREE_AND_CLEAR (m->spaces);
1591 if (m->msg) 1538 if (m->msg)
1592 FREE_AND_CLEAR (m->msg); 1539 FREE_AND_CLEAR (m->msg);
1593 if (m->maplore) 1540 if (m->maplore)
1594 FREE_AND_CLEAR (m->maplore); 1541 FREE_AND_CLEAR (m->maplore);
1595 if (m->shopitems) 1542
1596 delete[]m->shopitems; 1543 delete [] m->shopitems;
1597 m->shopitems = 0; 1544 m->shopitems = 0;
1545
1598 if (m->shoprace) 1546 if (m->shoprace)
1599 FREE_AND_CLEAR (m->shoprace); 1547 FREE_AND_CLEAR (m->shoprace);
1548
1600 if (m->buttons) 1549 if (m->buttons)
1601 free_objectlinkpt (m->buttons); 1550 free_objectlinkpt (m->buttons);
1551
1602 m->buttons = NULL; 1552 m->buttons = NULL;
1553
1603 for (i = 0; i < 4; i++) 1554 for (i = 0; i < 4; i++)
1604 { 1555 {
1605 if (m->tile_path[i]) 1556 if (m->tile_path[i])
1606 FREE_AND_CLEAR (m->tile_path[i]); 1557 FREE_AND_CLEAR (m->tile_path[i]);
1607 m->tile_map[i] = NULL; 1558 m->tile_map[i] = NULL;
1608 } 1559 }
1560
1609 m->in_memory = MAP_SWAPPED; 1561 m->in_memory = MAP_SWAPPED;
1562
1563#undef FREE_AND_CLEAR
1564
1610} 1565}
1611 1566
1612/* 1567/*
1613 * function: vanish maptile 1568 * function: vanish maptile
1614 * m : pointer to maptile, if NULL no action 1569 * m : pointer to maptile, if NULL no action
… …
1674 else 1629 else
1675 last->next = m->next; 1630 last->next = m->next;
1676 1631
1677 delete m; 1632 delete m;
1678} 1633}
1679
1680
1681 1634
1682/* 1635/*
1683 * Makes sure the given map is loaded and swapped in. 1636 * Makes sure the given map is loaded and swapped in.
1684 * name is path name of the map. 1637 * name is path name of the map.
1685 * flags meaning: 1638 * flags meaning:
… …
1688 * 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.
1689 * dont do any more name translation on it. 1642 * dont do any more name translation on it.
1690 * 1643 *
1691 * Returns a pointer to the given map. 1644 * Returns a pointer to the given map.
1692 */ 1645 */
1693
1694maptile * 1646maptile *
1695ready_map_name (const char *name, int flags) 1647ready_map_name (const char *name, int flags)
1696{ 1648{
1697 maptile *m; 1649 maptile *m;
1698 1650
… …
1821 return MAP_DIFFICULTY (m); 1773 return MAP_DIFFICULTY (m);
1822 } 1774 }
1823 1775
1824 for (x = 0; x < MAP_WIDTH (m); x++) 1776 for (x = 0; x < MAP_WIDTH (m); x++)
1825 for (y = 0; y < MAP_HEIGHT (m); y++) 1777 for (y = 0; y < MAP_HEIGHT (m); y++)
1826 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)
1827 { 1779 {
1828 if (QUERY_FLAG (op, FLAG_MONSTER)) 1780 if (QUERY_FLAG (op, FLAG_MONSTER))
1829 { 1781 {
1830 total_exp += op->stats.exp; 1782 total_exp += op->stats.exp;
1831 monster_cnt++; 1783 monster_cnt++;
… …
1924 /* All clients need to get re-updated for the change */ 1876 /* All clients need to get re-updated for the change */
1925 update_all_map_los (m); 1877 update_all_map_los (m);
1926 return 1; 1878 return 1;
1927} 1879}
1928 1880
1929
1930/* 1881/*
1931 * This function updates various attributes about a specific space 1882 * This function updates various attributes about a specific space
1932 * on the map (what it looks like, whether it blocks magic, 1883 * on the map (what it looks like, whether it blocks magic,
1933 * has a living creatures, prevents people from passing 1884 * has a living creatures, prevents people from passing
1934 * through, etc) 1885 * through, etc)
1935 */ 1886 */
1936void 1887void
1937update_position (maptile *m, int x, int y) 1888mapspace::update_ ()
1938{ 1889{
1939 object *tmp, *last = NULL; 1890 object *tmp, *last = 0;
1940 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1891 uint8 flags = 0, light = 0, anywhere = 0;
1941 New_Face *top, *floor, *middle; 1892 New_Face *top, *floor, *middle;
1942 object *top_obj, *floor_obj, *middle_obj; 1893 object *top_obj, *floor_obj, *middle_obj;
1943 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;
1944 1895
1945 oldflags = GET_MAP_FLAGS (m, x, y);
1946 if (!(oldflags & P_NEED_UPDATE))
1947 {
1948 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1949 return;
1950 }
1951
1952 middle = blank_face; 1896 middle = blank_face;
1953 top = blank_face; 1897 top = blank_face;
1954 floor = blank_face; 1898 floor = blank_face;
1955 1899
1956 middle_obj = NULL; 1900 middle_obj = 0;
1957 top_obj = NULL; 1901 top_obj = 0;
1958 floor_obj = NULL; 1902 floor_obj = 0;
1959 1903
1960 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1904 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1961 { 1905 {
1962
1963 /* This could be made additive I guess (two lights better than 1906 /* This could be made additive I guess (two lights better than
1964 * 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
1965 * light bulbs do not illuminate twice as far as once since 1908 * light bulbs do not illuminate twice as far as once since
1966 * it is a disapation factor that is squared (or is it cubed?) 1909 * it is a dissapation factor that is cubed.
1967 */ 1910 */
1968 if (tmp->glow_radius > light) 1911 if (tmp->glow_radius > light)
1969 light = tmp->glow_radius; 1912 light = tmp->glow_radius;
1970 1913
1971 /* This call is needed in order to update objects the player 1914 /* This call is needed in order to update objects the player
… …
2009 { 1952 {
2010 middle = tmp->face; 1953 middle = tmp->face;
2011 middle_obj = tmp; 1954 middle_obj = tmp;
2012 } 1955 }
2013 } 1956 }
1957
2014 if (tmp == tmp->above) 1958 if (tmp == tmp->above)
2015 { 1959 {
2016 LOG (llevError, "Error in structure of map\n"); 1960 LOG (llevError, "Error in structure of map\n");
2017 exit (-1); 1961 exit (-1);
2018 } 1962 }
2019 1963
2020 move_slow |= tmp->move_slow; 1964 move_slow |= tmp->move_slow;
2021 move_block |= tmp->move_block; 1965 move_block |= tmp->move_block;
2022 move_on |= tmp->move_on; 1966 move_on |= tmp->move_on;
2023 move_off |= tmp->move_off; 1967 move_off |= tmp->move_off;
2024 move_allow |= tmp->move_allow; 1968 move_allow |= tmp->move_allow;
2025 1969
2026 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2027 flags |= P_IS_ALIVE;
2028 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2029 flags |= P_NO_MAGIC;
2030 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2031 flags |= P_NO_CLERIC;
2032 if (tmp->type == SAFE_GROUND)
2033 flags |= P_SAFE;
2034
2035 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1970 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2036 flags |= P_BLOCKSVIEW; 1971 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2037 } /* for stack of objects */ 1972 if (tmp->type == PLAYER) flags |= P_PLAYER;
2038 1973 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2039 /* 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;
2040 * since we're already doing the work, we calculate them here. 1975 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2041 * if they don't match, logic is broken someplace.
2042 */
2043 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2044 { 1976 }
2045 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1977
2046 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1978 this->light = light;
2047 } 1979 this->flags_ = flags;
2048 SET_MAP_FLAGS (m, x, y, flags); 1980 this->move_block = move_block & ~move_allow;
2049 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1981 this->move_on = move_on;
2050 SET_MAP_MOVE_ON (m, x, y, move_on); 1982 this->move_off = move_off;
2051 SET_MAP_MOVE_OFF (m, x, y, move_off); 1983 this->move_slow = move_slow;
2052 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2053 1984
2054 /* 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),
2055 * 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
2056 * this point. 1987 * this point.
2057 * middle contains the highest visibility face. 1988 * middle contains the highest visibility face.
… …
2111 break; 2042 break;
2112 } 2043 }
2113 } 2044 }
2114 } 2045 }
2115 } 2046 }
2047
2116 if (middle == floor) 2048 if (middle == floor)
2117 middle = blank_face; 2049 middle = blank_face;
2050
2118 if (top == middle) 2051 if (top == middle)
2119 middle = blank_face; 2052 middle = blank_face;
2120 SET_MAP_FACE (m, x, y, top, 0);
2121 if (top != blank_face)
2122 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2123 else
2124 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2125 SET_MAP_FACE (m, x, y, middle, 1);
2126 if (middle != blank_face)
2127 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2128 else
2129 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2130 SET_MAP_FACE (m, x, y, floor, 2);
2131 if (floor != blank_face)
2132 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2133 else
2134 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2135 SET_MAP_LIGHT (m, x, y, light);
2136}
2137 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}
2138 2058
2139void 2059void
2140set_map_reset_time (maptile *map) 2060set_map_reset_time (maptile *map)
2141{ 2061{
2142 int timeout; 2062 int timeout;
… …
2144 timeout = MAP_RESET_TIMEOUT (map); 2064 timeout = MAP_RESET_TIMEOUT (map);
2145 if (timeout <= 0) 2065 if (timeout <= 0)
2146 timeout = MAP_DEFAULTRESET; 2066 timeout = MAP_DEFAULTRESET;
2147 if (timeout >= MAP_MAXRESET) 2067 if (timeout >= MAP_MAXRESET)
2148 timeout = MAP_MAXRESET; 2068 timeout = MAP_MAXRESET;
2149 MAP_WHEN_RESET (map) = seconds () + timeout; 2069 MAP_WHEN_RESET (map) = time (0) + timeout;
2150} 2070}
2151 2071
2152/* 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
2153 * 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
2154 * 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
… …
2182 * 2102 *
2183 */ 2103 */
2184int 2104int
2185out_of_map (maptile *m, int x, int y) 2105out_of_map (maptile *m, int x, int y)
2186{ 2106{
2187
2188 /* If we get passed a null map, this is obviously the 2107 /* If we get passed a null map, this is obviously the
2189 * case. This generally shouldn't happen, but if the 2108 * case. This generally shouldn't happen, but if the
2190 * map loads fail below, it could happen. 2109 * map loads fail below, it could happen.
2191 */ 2110 */
2192 if (!m) 2111 if (!m)
… …
2194 2113
2195 if (x < 0) 2114 if (x < 0)
2196 { 2115 {
2197 if (!m->tile_path[3]) 2116 if (!m->tile_path[3])
2198 return 1; 2117 return 1;
2118
2199 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)
2200 {
2201 load_and_link_tiled_map (m, 3); 2120 load_and_link_tiled_map (m, 3);
2202 } 2121
2203 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));
2204 } 2123 }
2124
2205 if (x >= MAP_WIDTH (m)) 2125 if (x >= MAP_WIDTH (m))
2206 { 2126 {
2207 if (!m->tile_path[1]) 2127 if (!m->tile_path[1])
2208 return 1; 2128 return 1;
2129
2209 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)
2210 {
2211 load_and_link_tiled_map (m, 1); 2131 load_and_link_tiled_map (m, 1);
2212 } 2132
2213 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));
2214 } 2134 }
2135
2215 if (y < 0) 2136 if (y < 0)
2216 { 2137 {
2217 if (!m->tile_path[0]) 2138 if (!m->tile_path[0])
2218 return 1; 2139 return 1;
2140
2219 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)
2220 {
2221 load_and_link_tiled_map (m, 0); 2142 load_and_link_tiled_map (m, 0);
2222 } 2143
2223 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])));
2224 } 2145 }
2146
2225 if (y >= MAP_HEIGHT (m)) 2147 if (y >= MAP_HEIGHT (m))
2226 { 2148 {
2227 if (!m->tile_path[2]) 2149 if (!m->tile_path[2])
2228 return 1; 2150 return 1;
2151
2229 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)
2230 {
2231 load_and_link_tiled_map (m, 2); 2153 load_and_link_tiled_map (m, 2);
2232 } 2154
2233 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)));
2234 } 2156 }
2235 2157
2236 /* Simple case - coordinates are within this local 2158 /* Simple case - coordinates are within this local
2237 * map. 2159 * map.
… …
2252{ 2174{
2253 2175
2254 if (*x < 0) 2176 if (*x < 0)
2255 { 2177 {
2256 if (!m->tile_path[3]) 2178 if (!m->tile_path[3])
2257 return NULL; 2179 return 0;
2258 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)
2259 load_and_link_tiled_map (m, 3); 2181 load_and_link_tiled_map (m, 3);
2260 2182
2261 *x += MAP_WIDTH (m->tile_map[3]); 2183 *x += MAP_WIDTH (m->tile_map[3]);
2262 return (get_map_from_coord (m->tile_map[3], x, y)); 2184 return (get_map_from_coord (m->tile_map[3], x, y));
2263 } 2185 }
2186
2264 if (*x >= MAP_WIDTH (m)) 2187 if (*x >= MAP_WIDTH (m))
2265 { 2188 {
2266 if (!m->tile_path[1]) 2189 if (!m->tile_path[1])
2267 return NULL; 2190 return 0;
2191
2268 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)
2269 load_and_link_tiled_map (m, 1); 2193 load_and_link_tiled_map (m, 1);
2270 2194
2271 *x -= MAP_WIDTH (m); 2195 *x -= MAP_WIDTH (m);
2272 return (get_map_from_coord (m->tile_map[1], x, y)); 2196 return (get_map_from_coord (m->tile_map[1], x, y));
2273 } 2197 }
2198
2274 if (*y < 0) 2199 if (*y < 0)
2275 { 2200 {
2276 if (!m->tile_path[0]) 2201 if (!m->tile_path[0])
2277 return NULL; 2202 return 0;
2203
2278 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)
2279 load_and_link_tiled_map (m, 0); 2205 load_and_link_tiled_map (m, 0);
2280 2206
2281 *y += MAP_HEIGHT (m->tile_map[0]); 2207 *y += MAP_HEIGHT (m->tile_map[0]);
2282 return (get_map_from_coord (m->tile_map[0], x, y)); 2208 return (get_map_from_coord (m->tile_map[0], x, y));
2283 } 2209 }
2210
2284 if (*y >= MAP_HEIGHT (m)) 2211 if (*y >= MAP_HEIGHT (m))
2285 { 2212 {
2286 if (!m->tile_path[2]) 2213 if (!m->tile_path[2])
2287 return NULL; 2214 return 0;
2215
2288 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)
2289 load_and_link_tiled_map (m, 2); 2217 load_and_link_tiled_map (m, 2);
2290 2218
2291 *y -= MAP_HEIGHT (m); 2219 *y -= MAP_HEIGHT (m);
2292 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