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.35 by root, Sun Dec 10 01:16:27 2006 UTC vs.
Revision 1.47 by root, Mon Dec 25 11:25:49 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;
… …
422 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 409 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
423 if (flag & P_OUT_OF_MAP) 410 if (flag & P_OUT_OF_MAP)
424 return P_OUT_OF_MAP; 411 return P_OUT_OF_MAP;
425 412
426 /* 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 */
427 return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); 414 return m1->at (sx, sy).move_block;
428 } 415 }
429 416
430 for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) 417 for (tmp = ob->arch; tmp; tmp = tmp->more)
431 { 418 {
432 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);
433 420
434 if (flag & P_OUT_OF_MAP) 421 if (flag & P_OUT_OF_MAP)
435 return P_OUT_OF_MAP; 422 return P_OUT_OF_MAP;
436 if (flag & P_IS_ALIVE) 423 if (flag & P_IS_ALIVE)
437 return P_IS_ALIVE; 424 return P_IS_ALIVE;
438 425
426 mapspace &ms = m1->at (sx, sy);
427
428
439 /* find_first_free_spot() calls this function. However, often 429 /* find_first_free_spot() calls this function. However, often
440 * 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)
441 * 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.
442 */ 432 */
443 433
444 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)
445 continue; 435 continue;
446 436
447 /* Note it is intentional that we check ob - the movement type of the 437 /* Note it is intentional that we check ob - the movement type of the
448 * head of the object should correspond for the entire object. 438 * head of the object should correspond for the entire object.
449 */ 439 */
450 if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) 440 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
451 return AB_NO_PASS; 441 return P_NO_PASS;
452
453 } 442 }
443
454 return 0; 444 return 0;
455} 445}
456 446
457/* When the map is loaded, load_object does not actually insert objects 447/* When the map is loaded, load_object does not actually insert objects
458 * into inventory, but just links them. What this does is go through 448 * into inventory, but just links them. What this does is go through
… …
495 object *tmp, *op, *last, *above; 485 object *tmp, *op, *last, *above;
496 archetype *at; 486 archetype *at;
497 487
498 for (x = 0; x < MAP_WIDTH (m); x++) 488 for (x = 0; x < MAP_WIDTH (m); x++)
499 for (y = 0; y < MAP_HEIGHT (m); y++) 489 for (y = 0; y < MAP_HEIGHT (m); y++)
500 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 490 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
501 { 491 {
502 above = tmp->above; 492 above = tmp->above;
503 493
504 /* already multipart - don't do anything more */ 494 /* already multipart - don't do anything more */
505 if (tmp->head || tmp->more) 495 if (tmp->head || tmp->more)
… …
540{ 530{
541 int i, j; 531 int i, j;
542 int unique; 532 int unique;
543 object *op, *prev = NULL, *last_more = NULL, *otmp; 533 object *op, *prev = NULL, *last_more = NULL, *otmp;
544 534
545 op = get_object (); 535 op = object::create ();
546 op->map = m; /* To handle buttons correctly */ 536 op->map = m; /* To handle buttons correctly */
547 537
548 while ((i = load_object (fp, op, mapflags))) 538 while ((i = load_object (fp, op, mapflags)))
549 { 539 {
550 /* if the archetype for the object is null, means that we 540 /* if the archetype for the object is null, means that we
… …
555 { 545 {
556 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)");
557 continue; 547 continue;
558 } 548 }
559 549
560
561 switch (i) 550 switch (i)
562 { 551 {
563 case LL_NORMAL: 552 case LL_NORMAL:
564 /* 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 */
565 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)
566 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);
567 else 556 else
568 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);
569 558
570 if (op->inv) 559 if (op->inv)
571 sum_weight (op); 560 sum_weight (op);
572 561
573 prev = op, last_more = op; 562 prev = op, last_more = op;
574 break; 563 break;
575 564
576 case LL_MORE: 565 case LL_MORE:
577 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);
578 op->head = prev, last_more->more = op, last_more = op; 567 op->head = prev, last_more->more = op, last_more = op;
579 break; 568 break;
580 } 569 }
581 570
582 if (mapflags & MAP_STYLE) 571 if (mapflags & MAP_STYLE)
583 remove_from_active_list (op); 572 remove_from_active_list (op);
584 573
585 op = get_object (); 574 op = object::create ();
586 op->map = m; 575 op->map = m;
587 } 576 }
588 577
589 for (i = 0; i < m->width; i++) 578 for (i = 0; i < m->width; i++)
590 { 579 {
591 for (j = 0; j < m->height; j++) 580 for (j = 0; j < m->height; j++)
592 { 581 {
593 unique = 0; 582 unique = 0;
594 /* check for unique items, or unique squares */ 583 /* check for unique items, or unique squares */
595 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)
596 { 585 {
597 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))
598 unique = 1; 587 unique = 1;
588
599 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) 589 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
600 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); 590 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
601 } 591 }
602 } 592 }
603 } 593 }
604 594
605 free_object (op); 595 op->destroy ();
606 link_multipart_objects (m); 596 link_multipart_objects (m);
607} 597}
608 598
609/* This saves all the objects on the map in a non destructive fashion. 599/* 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, 600 * Modified by MSW 2001-07-01 to do in a single pass - reduces code,
… …
620 /* first pass - save one-part objects */ 610 /* first pass - save one-part objects */
621 for (i = 0; i < MAP_WIDTH (m); i++) 611 for (i = 0; i < MAP_WIDTH (m); i++)
622 for (j = 0; j < MAP_HEIGHT (m); j++) 612 for (j = 0; j < MAP_HEIGHT (m); j++)
623 { 613 {
624 unique = 0; 614 unique = 0;
625 for (op = get_map_ob (m, i, j); op; op = op->above) 615 for (op = GET_MAP_OB (m, i, j); op; op = op->above)
626 { 616 {
627 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 617 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
628 unique = 1; 618 unique = 1;
629 619
630 if (op->type == PLAYER) 620 if (op->type == PLAYER)
631 {
632 LOG (llevDebug, "Player on map that is being saved\n");
633 continue; 621 continue;
634 }
635 622
636 if (op->head || op->owner) 623 if (op->head || op->owner)
637 continue; 624 continue;
638 625
639 if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) 626 if (unique || QUERY_FLAG (op, FLAG_UNIQUE))
640 save_object (fp2, op, 3); 627 save_object (fp2, op, 3);
641 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) 628 else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID))))
642 save_object (fp, op, 3); 629 save_object (fp, op, 3);
643 630 }
644 } /* for this space */ 631 }
645 } /* for this j */
646} 632}
647 633
648maptile::maptile () 634maptile::maptile ()
649{ 635{
650 in_memory = MAP_SWAPPED; 636 in_memory = MAP_SWAPPED;
… …
700 { 686 {
701 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);
702 free (spaces); 688 free (spaces);
703 } 689 }
704 690
705 spaces = (MapSpace *) 691 spaces = (mapspace *)
706 calloc (1, width * height * sizeof (MapSpace)); 692 calloc (1, width * height * sizeof (mapspace));
707 693
708 if (!spaces) 694 if (!spaces)
709 fatal (OUT_OF_MEMORY); 695 fatal (OUT_OF_MEMORY);
710} 696}
711 697
… …
737 char *shop_string, *p, *q, *next_semicolon, *next_colon; 723 char *shop_string, *p, *q, *next_semicolon, *next_colon;
738 shopitems *items = NULL; 724 shopitems *items = NULL;
739 int i = 0, number_of_entries = 0; 725 int i = 0, number_of_entries = 0;
740 const typedata *current_type; 726 const typedata *current_type;
741 727
742 shop_string = strdup_local (input_string); 728 shop_string = strdup (input_string);
743 p = shop_string; 729 p = shop_string;
744 /* 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 */
745 while (p) 731 while (p)
746 { 732 {
747 p = strchr (p, ';'); 733 p = strchr (p, ';');
… …
860 846
861 while (fgets (buf, HUGE_BUF, fp) != NULL) 847 while (fgets (buf, HUGE_BUF, fp) != NULL)
862 { 848 {
863 buf[HUGE_BUF - 1] = 0; 849 buf[HUGE_BUF - 1] = 0;
864 key = buf; 850 key = buf;
851
865 while (isspace (*key)) 852 while (isspace (*key))
866 key++; 853 key++;
854
867 if (*key == 0) 855 if (*key == 0)
868 continue; /* empty line */ 856 continue; /* empty line */
857
869 value = strchr (key, ' '); 858 value = strchr (key, ' ');
859
870 if (!value) 860 if (!value)
871 { 861 {
872 end = strchr (key, '\n'); 862 if ((end = strchr (key, '\n')))
873 if (end != NULL)
874 {
875 *end = 0; 863 *end = 0;
876 }
877 } 864 }
878 else 865 else
879 { 866 {
880 *value = 0; 867 *value = 0;
881 value++; 868 value++;
882 end = strchr (value, '\n'); 869 end = strchr (value, '\n');
870
883 while (isspace (*value)) 871 while (isspace (*value))
884 { 872 {
885 value++; 873 value++;
874
886 if (*value == '\0' || value == end) 875 if (*value == '\0' || value == end)
887 { 876 {
888 /* Nothing but spaces. */ 877 /* Nothing but spaces. */
889 value = NULL; 878 value = NULL;
890 break; 879 break;
… …
930 * with nothing between). There is no reason in those cases to 919 * with nothing between). There is no reason in those cases to
931 * keep the empty message. Also, msgbuf contains garbage data 920 * keep the empty message. Also, msgbuf contains garbage data
932 * when msgpos is zero, so copying it results in crashes 921 * when msgpos is zero, so copying it results in crashes
933 */ 922 */
934 if (msgpos != 0) 923 if (msgpos != 0)
935 m->msg = strdup_local (msgbuf); 924 m->msg = strdup (msgbuf);
936 } 925 }
937 else if (!strcmp (key, "maplore")) 926 else if (!strcmp (key, "maplore"))
938 { 927 {
939 while (fgets (buf, HUGE_BUF, fp) != NULL) 928 while (fgets (buf, HUGE_BUF, fp) != NULL)
940 { 929 {
… …
946 strcpy (maplorebuf + maplorepos, buf); 935 strcpy (maplorebuf + maplorepos, buf);
947 maplorepos += strlen (buf); 936 maplorepos += strlen (buf);
948 } 937 }
949 } 938 }
950 if (maplorepos != 0) 939 if (maplorepos != 0)
951 m->maplore = strdup_local (maplorebuf); 940 m->maplore = strdup (maplorebuf);
952 } 941 }
953 else if (!strcmp (key, "end")) 942 else if (!strcmp (key, "end"))
954 { 943 {
955 break; 944 break;
956 } 945 }
… …
965 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);
966 } 955 }
967 else if (!strcmp (key, "name")) 956 else if (!strcmp (key, "name"))
968 { 957 {
969 *end = 0; 958 *end = 0;
970 m->name = strdup_local (value); 959 m->name = strdup (value);
971 } 960 }
972 /* first strcmp value on these are old names supported 961 /* first strcmp value on these are old names supported
973 * for compatibility reasons. The new values (second) are 962 * for compatibility reasons. The new values (second) are
974 * what really should be used. 963 * what really should be used.
975 */ 964 */
976 else if (!strcmp (key, "oid")) 965 else if (!strcmp (key, "oid"))
977 {
978 fp.get (m, atoi (value)); 966 fp.get (m, atoi (value));
979 }
980 else if (!strcmp (key, "attach")) 967 else if (!strcmp (key, "attach"))
981 {
982 m->attach = value; 968 m->attach = value;
983 }
984 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) 969 else if (!strcmp (key, "hp") || !strcmp (key, "enter_x"))
985 {
986 m->enter_x = atoi (value); 970 m->enter_x = atoi (value);
987 }
988 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) 971 else if (!strcmp (key, "sp") || !strcmp (key, "enter_y"))
989 {
990 m->enter_y = atoi (value); 972 m->enter_y = atoi (value);
991 }
992 else if (!strcmp (key, "x") || !strcmp (key, "width")) 973 else if (!strcmp (key, "x") || !strcmp (key, "width"))
993 {
994 m->width = atoi (value); 974 m->width = atoi (value);
995 }
996 else if (!strcmp (key, "y") || !strcmp (key, "height")) 975 else if (!strcmp (key, "y") || !strcmp (key, "height"))
997 {
998 m->height = atoi (value); 976 m->height = atoi (value);
999 }
1000 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) 977 else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout"))
1001 {
1002 m->reset_timeout = atoi (value); 978 m->reset_timeout = atoi (value);
1003 }
1004 else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) 979 else if (!strcmp (key, "value") || !strcmp (key, "swap_time"))
1005 {
1006 m->timeout = atoi (value); 980 m->timeout = atoi (value);
1007 }
1008 else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) 981 else if (!strcmp (key, "level") || !strcmp (key, "difficulty"))
1009 { 982 m->difficulty = clamp (atoi (value), 1, settings.max_level);
1010 m->difficulty = atoi (value);
1011 }
1012 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) 983 else if (!strcmp (key, "invisible") || !strcmp (key, "darkness"))
1013 {
1014 m->darkness = atoi (value); 984 m->darkness = atoi (value);
1015 }
1016 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) 985 else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime"))
1017 {
1018 m->fixed_resettime = atoi (value); 986 m->fixed_resettime = atoi (value);
1019 }
1020 else if (!strcmp (key, "unique")) 987 else if (!strcmp (key, "unique"))
1021 {
1022 m->unique = atoi (value); 988 m->unique = atoi (value);
1023 }
1024 else if (!strcmp (key, "template")) 989 else if (!strcmp (key, "template"))
1025 {
1026 m->templatemap = atoi (value); 990 m->templatemap = atoi (value);
1027 }
1028 else if (!strcmp (key, "region")) 991 else if (!strcmp (key, "region"))
1029 {
1030 m->region = get_region_by_name (value); 992 m->region = get_region_by_name (value);
1031 }
1032 else if (!strcmp (key, "shopitems")) 993 else if (!strcmp (key, "shopitems"))
1033 { 994 {
1034 *end = 0; 995 *end = 0;
1035 m->shopitems = parse_shop_string (value); 996 m->shopitems = parse_shop_string (value);
1036 } 997 }
1037 else if (!strcmp (key, "shopgreed")) 998 else if (!strcmp (key, "shopgreed"))
1038 {
1039 m->shopgreed = atof (value); 999 m->shopgreed = atof (value);
1040 }
1041 else if (!strcmp (key, "shopmin")) 1000 else if (!strcmp (key, "shopmin"))
1042 {
1043 m->shopmin = atol (value); 1001 m->shopmin = atol (value);
1044 }
1045 else if (!strcmp (key, "shopmax")) 1002 else if (!strcmp (key, "shopmax"))
1046 {
1047 m->shopmax = atol (value); 1003 m->shopmax = atol (value);
1048 }
1049 else if (!strcmp (key, "shoprace")) 1004 else if (!strcmp (key, "shoprace"))
1050 { 1005 {
1051 *end = 0; 1006 *end = 0;
1052 m->shoprace = strdup_local (value); 1007 m->shoprace = strdup (value);
1053 } 1008 }
1054 else if (!strcmp (key, "outdoor")) 1009 else if (!strcmp (key, "outdoor"))
1055 {
1056 m->outdoor = atoi (value); 1010 m->outdoor = atoi (value);
1057 }
1058 else if (!strcmp (key, "temp")) 1011 else if (!strcmp (key, "temp"))
1059 {
1060 m->temp = atoi (value); 1012 m->temp = atoi (value);
1061 }
1062 else if (!strcmp (key, "pressure")) 1013 else if (!strcmp (key, "pressure"))
1063 {
1064 m->pressure = atoi (value); 1014 m->pressure = atoi (value);
1065 }
1066 else if (!strcmp (key, "humid")) 1015 else if (!strcmp (key, "humid"))
1067 {
1068 m->humid = atoi (value); 1016 m->humid = atoi (value);
1069 }
1070 else if (!strcmp (key, "windspeed")) 1017 else if (!strcmp (key, "windspeed"))
1071 {
1072 m->windspeed = atoi (value); 1018 m->windspeed = atoi (value);
1073 }
1074 else if (!strcmp (key, "winddir")) 1019 else if (!strcmp (key, "winddir"))
1075 {
1076 m->winddir = atoi (value); 1020 m->winddir = atoi (value);
1077 }
1078 else if (!strcmp (key, "sky")) 1021 else if (!strcmp (key, "sky"))
1079 {
1080 m->sky = atoi (value); 1022 m->sky = atoi (value);
1081 }
1082 else if (!strcmp (key, "nosmooth")) 1023 else if (!strcmp (key, "nosmooth"))
1083 {
1084 m->nosmooth = atoi (value); 1024 m->nosmooth = atoi (value);
1085 }
1086 else if (!strncmp (key, "tile_path_", 10)) 1025 else if (!strncmp (key, "tile_path_", 10))
1087 { 1026 {
1088 int tile = atoi (key + 10); 1027 int tile = atoi (key + 10);
1089 1028
1090 if (tile < 1 || tile > 4) 1029 if (tile < 1 || tile > 4)
… …
1123 } 1062 }
1124 1063
1125 if (editor) 1064 if (editor)
1126 { 1065 {
1127 /* Use the value as in the file. */ 1066 /* Use the value as in the file. */
1128 m->tile_path[tile - 1] = strdup_local (value); 1067 m->tile_path[tile - 1] = strdup (value);
1129 } 1068 }
1130 else if (path != NULL) 1069 else if (path != NULL)
1131 { 1070 {
1132 /* Use the normalized value. */ 1071 /* Use the normalized value. */
1133 m->tile_path[tile - 1] = strdup_local (path); 1072 m->tile_path[tile - 1] = strdup (path);
1134 } 1073 }
1135 } /* end if tile direction (in)valid */ 1074 } /* end if tile direction (in)valid */
1136 } 1075 }
1137 else 1076 else
1138 {
1139 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);
1140 }
1141 } 1078 }
1079
1142 if (!key || strcmp (key, "end")) 1080 if (!key || strcmp (key, "end"))
1143 { 1081 {
1144 LOG (llevError, "Got premature eof on map header!\n"); 1082 LOG (llevError, "Got premature eof on map header!\n");
1145 return 1; 1083 return 1;
1146 } 1084 }
1085
1147 return 0; 1086 return 0;
1148} 1087}
1149 1088
1150/* 1089/*
1151 * Opens the file "filename" and reads information about the map 1090 * Opens the file "filename" and reads information about the map
… …
1184 strcpy (m->path, filename); 1123 strcpy (m->path, filename);
1185 if (load_map_header (thawer, m)) 1124 if (load_map_header (thawer, m))
1186 { 1125 {
1187 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);
1188 delete_map (m); 1127 delete_map (m);
1189 return NULL; 1128 return 0;
1190 } 1129 }
1191 1130
1192 m->allocate (); 1131 m->allocate ();
1193 1132
1194 m->in_memory = MAP_LOADING; 1133 m->in_memory = MAP_LOADING;
… …
1277 if (load_map_header (thawer, m)) 1216 if (load_map_header (thawer, m))
1278 { 1217 {
1279 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);
1280 delete_map (m); 1219 delete_map (m);
1281 m = load_original_map (m->path, 0); 1220 m = load_original_map (m->path, 0);
1282 return NULL; 1221 return 0;
1283 } 1222 }
1284 /*m->allocate ();*/ 1223 /*m->allocate ();*/
1285 1224
1286 m->in_memory = MAP_LOADING; 1225 m->in_memory = MAP_LOADING;
1287 load_objects (m, thawer, MAP_OVERLAY); 1226 load_objects (m, thawer, MAP_OVERLAY);
… …
1303 1242
1304 for (i = 0; i < MAP_WIDTH (m); i++) 1243 for (i = 0; i < MAP_WIDTH (m); i++)
1305 for (j = 0; j < MAP_HEIGHT (m); j++) 1244 for (j = 0; j < MAP_HEIGHT (m); j++)
1306 { 1245 {
1307 unique = 0; 1246 unique = 0;
1247
1308 for (op = get_map_ob (m, i, j); op; op = next) 1248 for (op = GET_MAP_OB (m, i, j); op; op = next)
1309 { 1249 {
1310 next = op->above; 1250 next = op->above;
1251
1311 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))
1312 unique = 1; 1253 unique = 1;
1254
1313 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 1255 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
1314 { 1256 {
1315 clean_object (op); 1257 op->destroy_inv (false);
1316 if (QUERY_FLAG (op, FLAG_IS_LINKED)) 1258 op->destroy ();
1317 remove_button_link (op);
1318 remove_ob (op);
1319 free_object (op);
1320 } 1259 }
1321 } 1260 }
1322 } 1261 }
1323} 1262}
1324 1263
… …
1393 make_path_to_file (filename); 1332 make_path_to_file (filename);
1394 } 1333 }
1395 else 1334 else
1396 { 1335 {
1397 if (!m->tmpname) 1336 if (!m->tmpname)
1398 m->tmpname = tempnam_local (settings.tmpdir, NULL); 1337 m->tmpname = tempnam (settings.tmpdir, NULL);
1399 1338
1400 strcpy (filename, m->tmpname); 1339 strcpy (filename, m->tmpname);
1401 } 1340 }
1402 1341
1403 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); 1342 LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
… …
1427 print_shop_string (m, shop); 1366 print_shop_string (m, shop);
1428 fprintf (freezer, "shopitems %s\n", shop); 1367 fprintf (freezer, "shopitems %s\n", shop);
1429 } 1368 }
1430 if (m->shopgreed) 1369 if (m->shopgreed)
1431 fprintf (freezer, "shopgreed %f\n", m->shopgreed); 1370 fprintf (freezer, "shopgreed %f\n", m->shopgreed);
1432#ifndef WIN32
1433 if (m->shopmin) 1371 if (m->shopmin)
1434 fprintf (freezer, "shopmin %llu\n", m->shopmin); 1372 fprintf (freezer, "shopmin %llu\n", m->shopmin);
1435 if (m->shopmax) 1373 if (m->shopmax)
1436 fprintf (freezer, "shopmax %llu\n", m->shopmax); 1374 fprintf (freezer, "shopmax %llu\n", m->shopmax);
1437#else
1438 if (m->shopmin)
1439 fprintf (freezer, "shopmin %I64u\n", m->shopmin);
1440 if (m->shopmax)
1441 fprintf (freezer, "shopmax %I64u\n", m->shopmax);
1442#endif
1443 if (m->shoprace) 1375 if (m->shoprace)
1444 fprintf (freezer, "shoprace %s\n", m->shoprace); 1376 fprintf (freezer, "shoprace %s\n", m->shoprace);
1445 if (m->darkness) 1377 if (m->darkness)
1446 fprintf (freezer, "darkness %d\n", m->darkness); 1378 fprintf (freezer, "darkness %d\n", m->darkness);
1447 if (m->width) 1379 if (m->width)
… …
1512 freezer.save (filename); 1444 freezer.save (filename);
1513 1445
1514 return 0; 1446 return 0;
1515} 1447}
1516 1448
1517
1518/*
1519 * Remove and free all objects in the inventory of the given object.
1520 * object.c ?
1521 */
1522
1523void
1524clean_object (object *op)
1525{
1526 object *tmp, *next;
1527
1528 for (tmp = op->inv; tmp; tmp = next)
1529 {
1530 next = tmp->below;
1531 clean_object (tmp);
1532 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
1533 remove_button_link (tmp);
1534 remove_ob (tmp);
1535 free_object (tmp);
1536 }
1537}
1538
1539/* 1449/*
1540 * Remove and free all objects in the given map. 1450 * Remove and free all objects in the given map.
1541 */ 1451 */
1542
1543void 1452void
1544free_all_objects (maptile *m) 1453free_all_objects (maptile *m)
1545{ 1454{
1546 int i, j; 1455 if (!m->spaces)
1547 object *op; 1456 return;
1548 1457
1549 for (i = 0; i < MAP_WIDTH (m); i++) 1458 for (int i = 0; i < MAP_WIDTH (m); i++)
1550 for (j = 0; j < MAP_HEIGHT (m); j++) 1459 for (int j = 0; j < MAP_HEIGHT (m); j++)
1551 { 1460 {
1552 object *previous_obj = NULL; 1461 mapspace &ms = m->at (i, j);
1553 1462
1554 while ((op = GET_MAP_OB (m, i, j)) != NULL) 1463 while (object *op = ms.bottom)
1555 { 1464 {
1556 if (op == previous_obj)
1557 {
1558 LOG (llevDebug, "free_all_objects: Link error, bailing out.\n");
1559 break;
1560 }
1561 previous_obj = op;
1562 if (op->head != NULL) 1465 if (op->head)
1563 op = op->head; 1466 op = op->head;
1564 1467
1565 /* If the map isn't in memory, free_object will remove and 1468 op->destroy_inv (false);
1566 * free objects in op's inventory. So let it do the job. 1469 op->destroy ();
1567 */
1568 if (m->in_memory == MAP_IN_MEMORY)
1569 clean_object (op);
1570 remove_ob (op);
1571 free_object (op);
1572 } 1470 }
1573 } 1471 }
1574} 1472}
1575 1473
1576/* 1474/*
1577 * Frees everything allocated by the given maptileure. 1475 * Frees everything allocated by the given maptileure.
1578 * don't free tmpname - our caller is left to do that 1476 * don't free tmpname - our caller is left to do that
1579 */ 1477 */
1580
1581void 1478void
1582free_map (maptile *m, int flag) 1479free_map (maptile *m, int flag)
1583{ 1480{
1584 int i; 1481 if (m->in_memory != MAP_IN_MEMORY)
1585
1586 if (!m->in_memory)
1587 {
1588 LOG (llevError, "Trying to free freed map.\n");
1589 return; 1482 return;
1590 } 1483
1484 m->in_memory = MAP_SAVING;
1485
1486 // TODO: use new/delete
1487#define FREE_AND_CLEAR(p) { free (p); p = NULL; }
1488
1591 if (flag && m->spaces) 1489 if (flag && m->spaces)
1592 free_all_objects (m); 1490 free_all_objects (m);
1593 if (m->name) 1491 if (m->name)
1594 FREE_AND_CLEAR (m->name); 1492 FREE_AND_CLEAR (m->name);
1595 if (m->spaces) 1493 if (m->spaces)
1596 FREE_AND_CLEAR (m->spaces); 1494 FREE_AND_CLEAR (m->spaces);
1597 if (m->msg) 1495 if (m->msg)
1598 FREE_AND_CLEAR (m->msg); 1496 FREE_AND_CLEAR (m->msg);
1599 if (m->maplore) 1497 if (m->maplore)
1600 FREE_AND_CLEAR (m->maplore); 1498 FREE_AND_CLEAR (m->maplore);
1601 if (m->shopitems) 1499
1602 delete[]m->shopitems; 1500 delete [] m->shopitems;
1603 m->shopitems = 0; 1501 m->shopitems = 0;
1502
1604 if (m->shoprace) 1503 if (m->shoprace)
1605 FREE_AND_CLEAR (m->shoprace); 1504 FREE_AND_CLEAR (m->shoprace);
1505
1606 if (m->buttons) 1506 if (m->buttons)
1607 free_objectlinkpt (m->buttons); 1507 free_objectlinkpt (m->buttons);
1508
1608 m->buttons = NULL; 1509 m->buttons = NULL;
1510
1609 for (i = 0; i < 4; i++) 1511 for (int i = 0; i < 4; i++)
1610 { 1512 {
1611 if (m->tile_path[i]) 1513 if (m->tile_path[i])
1612 FREE_AND_CLEAR (m->tile_path[i]); 1514 FREE_AND_CLEAR (m->tile_path[i]);
1515
1613 m->tile_map[i] = NULL; 1516 m->tile_map[i] = 0;
1614 } 1517 }
1518
1615 m->in_memory = MAP_SWAPPED; 1519 m->in_memory = MAP_SWAPPED;
1616}
1617 1520
1618/* 1521#undef FREE_AND_CLEAR
1619 * function: vanish maptile 1522}
1620 * m : pointer to maptile, if NULL no action 1523
1621 * this deletes all the data on the map (freeing pointers) 1524maptile::~maptile ()
1622 * 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.
1623 */ 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;
1624 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
1625void 1560void
1626delete_map (maptile *m) 1561delete_map (maptile *m)
1627{ 1562{
1628 maptile *tmp, *last;
1629 int i;
1630
1631 if (!m) 1563 if (m)
1632 return; 1564 m->destroy ();
1633
1634 m->clear ();
1635
1636 if (m->in_memory == MAP_IN_MEMORY)
1637 {
1638 /* change to MAP_SAVING, even though we are not,
1639 * so that remove_ob doesn't do as much work.
1640 */
1641 m->in_memory = MAP_SAVING;
1642 free_map (m, 1);
1643 }
1644 /* move this out of free_map, since tmpname can still be needed if
1645 * the map is swapped out.
1646 */
1647 if (m->tmpname)
1648 {
1649 free (m->tmpname);
1650 m->tmpname = NULL;
1651 }
1652 last = NULL;
1653 /* We need to look through all the maps and see if any maps
1654 * are pointing at this one for tiling information. Since
1655 * tiling can be assymetric, we just can not look to see which
1656 * maps this map tiles with and clears those.
1657 */
1658 for (tmp = first_map; tmp != NULL; tmp = tmp->next)
1659 {
1660 if (tmp->next == m)
1661 last = tmp;
1662
1663 /* This should hopefully get unrolled on a decent compiler */
1664 for (i = 0; i < 4; i++)
1665 if (tmp->tile_map[i] == m)
1666 tmp->tile_map[i] = NULL;
1667 }
1668
1669 /* If last is null, then this should be the first map in the list */
1670 if (!last)
1671 {
1672 if (m == first_map)
1673 first_map = m->next;
1674 else
1675 /* m->path is a static char, so should hopefully still have
1676 * some useful data in it.
1677 */
1678 LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path);
1679 }
1680 else
1681 last->next = m->next;
1682
1683 delete m;
1684} 1565}
1685
1686
1687 1566
1688/* 1567/*
1689 * Makes sure the given map is loaded and swapped in. 1568 * Makes sure the given map is loaded and swapped in.
1690 * name is path name of the map. 1569 * name is path name of the map.
1691 * flags meaning: 1570 * flags meaning:
… …
1694 * 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.
1695 * dont do any more name translation on it. 1574 * dont do any more name translation on it.
1696 * 1575 *
1697 * Returns a pointer to the given map. 1576 * Returns a pointer to the given map.
1698 */ 1577 */
1699
1700maptile * 1578maptile *
1701ready_map_name (const char *name, int flags) 1579ready_map_name (const char *name, int flags)
1702{ 1580{
1703 maptile *m;
1704
1705 if (!name) 1581 if (!name)
1706 return (NULL); 1582 return 0;
1707 1583
1708 /* Have we been at this level before? */ 1584 /* Have we been at this level before? */
1709 m = has_been_loaded (name); 1585 maptile *m = has_been_loaded (name);
1710 1586
1711 /* Map is good to go, so just return it */ 1587 /* Map is good to go, so just return it */
1712 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))
1713 {
1714 return m; 1589 return m;
1715 }
1716 1590
1717 /* unique maps always get loaded from their original location, and never 1591 /* unique maps always get loaded from their original location, and never
1718 * 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
1719 * 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 -
1720 * 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
… …
1722 * 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
1723 * 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.
1724 */ 1598 */
1725 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) 1599 if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m)
1726 { 1600 {
1727
1728 /* first visit or time to reset */ 1601 /* first visit or time to reset */
1729 if (m) 1602 if (m)
1730 { 1603 {
1731 clean_tmp_map (m); /* Doesn't make much difference */ 1604 clean_tmp_map (m); /* Doesn't make much difference */
1732 delete_map (m); 1605 delete_map (m);
… …
1827 return MAP_DIFFICULTY (m); 1700 return MAP_DIFFICULTY (m);
1828 } 1701 }
1829 1702
1830 for (x = 0; x < MAP_WIDTH (m); x++) 1703 for (x = 0; x < MAP_WIDTH (m); x++)
1831 for (y = 0; y < MAP_HEIGHT (m); y++) 1704 for (y = 0; y < MAP_HEIGHT (m); y++)
1832 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)
1833 { 1706 {
1834 if (QUERY_FLAG (op, FLAG_MONSTER)) 1707 if (QUERY_FLAG (op, FLAG_MONSTER))
1835 { 1708 {
1836 total_exp += op->stats.exp; 1709 total_exp += op->stats.exp;
1837 monster_cnt++; 1710 monster_cnt++;
… …
1930 /* All clients need to get re-updated for the change */ 1803 /* All clients need to get re-updated for the change */
1931 update_all_map_los (m); 1804 update_all_map_los (m);
1932 return 1; 1805 return 1;
1933} 1806}
1934 1807
1935
1936/* 1808/*
1937 * This function updates various attributes about a specific space 1809 * This function updates various attributes about a specific space
1938 * on the map (what it looks like, whether it blocks magic, 1810 * on the map (what it looks like, whether it blocks magic,
1939 * has a living creatures, prevents people from passing 1811 * has a living creatures, prevents people from passing
1940 * through, etc) 1812 * through, etc)
1941 */ 1813 */
1942void 1814void
1943update_position (maptile *m, int x, int y) 1815mapspace::update_ ()
1944{ 1816{
1945 object *tmp, *last = NULL; 1817 object *tmp, *last = 0;
1946 uint8 flags = 0, oldflags, light = 0, anywhere = 0; 1818 uint8 flags = 0, light = 0, anywhere = 0;
1947 New_Face *top, *floor, *middle; 1819 New_Face *top, *floor, *middle;
1948 object *top_obj, *floor_obj, *middle_obj; 1820 object *top_obj, *floor_obj, *middle_obj;
1949 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;
1950 1822
1951 oldflags = GET_MAP_FLAGS (m, x, y);
1952 if (!(oldflags & P_NEED_UPDATE))
1953 {
1954 LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y);
1955 return;
1956 }
1957
1958 middle = blank_face; 1823 middle = blank_face;
1959 top = blank_face; 1824 top = blank_face;
1960 floor = blank_face; 1825 floor = blank_face;
1961 1826
1962 middle_obj = NULL; 1827 middle_obj = 0;
1963 top_obj = NULL; 1828 top_obj = 0;
1964 floor_obj = NULL; 1829 floor_obj = 0;
1965 1830
1966 for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) 1831 for (tmp = bottom; tmp; last = tmp, tmp = tmp->above)
1967 { 1832 {
1968
1969 /* This could be made additive I guess (two lights better than 1833 /* This could be made additive I guess (two lights better than
1970 * 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
1971 * light bulbs do not illuminate twice as far as once since 1835 * light bulbs do not illuminate twice as far as once since
1972 * it is a disapation factor that is squared (or is it cubed?) 1836 * it is a dissapation factor that is cubed.
1973 */ 1837 */
1974 if (tmp->glow_radius > light) 1838 if (tmp->glow_radius > light)
1975 light = tmp->glow_radius; 1839 light = tmp->glow_radius;
1976 1840
1977 /* This call is needed in order to update objects the player 1841 /* This call is needed in order to update objects the player
… …
2015 { 1879 {
2016 middle = tmp->face; 1880 middle = tmp->face;
2017 middle_obj = tmp; 1881 middle_obj = tmp;
2018 } 1882 }
2019 } 1883 }
1884
2020 if (tmp == tmp->above) 1885 if (tmp == tmp->above)
2021 { 1886 {
2022 LOG (llevError, "Error in structure of map\n"); 1887 LOG (llevError, "Error in structure of map\n");
2023 exit (-1); 1888 exit (-1);
2024 } 1889 }
2025 1890
2026 move_slow |= tmp->move_slow; 1891 move_slow |= tmp->move_slow;
2027 move_block |= tmp->move_block; 1892 move_block |= tmp->move_block;
2028 move_on |= tmp->move_on; 1893 move_on |= tmp->move_on;
2029 move_off |= tmp->move_off; 1894 move_off |= tmp->move_off;
2030 move_allow |= tmp->move_allow; 1895 move_allow |= tmp->move_allow;
2031 1896
2032 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2033 flags |= P_IS_ALIVE;
2034 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))
2035 flags |= P_NO_MAGIC;
2036 if (QUERY_FLAG (tmp, FLAG_DAMNED))
2037 flags |= P_NO_CLERIC;
2038 if (tmp->type == SAFE_GROUND)
2039 flags |= P_SAFE;
2040
2041 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) 1897 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
2042 flags |= P_BLOCKSVIEW; 1898 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC;
2043 } /* for stack of objects */ 1899 if (tmp->type == PLAYER) flags |= P_PLAYER;
2044 1900 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
2045 /* 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;
2046 * since we're already doing the work, we calculate them here. 1902 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
2047 * if they don't match, logic is broken someplace.
2048 */
2049 if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR)))
2050 { 1903 }
2051 LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", 1904
2052 m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); 1905 this->light = light;
2053 } 1906 this->flags_ = flags;
2054 SET_MAP_FLAGS (m, x, y, flags); 1907 this->move_block = move_block & ~move_allow;
2055 SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); 1908 this->move_on = move_on;
2056 SET_MAP_MOVE_ON (m, x, y, move_on); 1909 this->move_off = move_off;
2057 SET_MAP_MOVE_OFF (m, x, y, move_off); 1910 this->move_slow = move_slow;
2058 SET_MAP_MOVE_SLOW (m, x, y, move_slow);
2059 1911
2060 /* 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),
2061 * 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
2062 * this point. 1914 * this point.
2063 * middle contains the highest visibility face. 1915 * middle contains the highest visibility face.
… …
2117 break; 1969 break;
2118 } 1970 }
2119 } 1971 }
2120 } 1972 }
2121 } 1973 }
1974
2122 if (middle == floor) 1975 if (middle == floor)
2123 middle = blank_face; 1976 middle = blank_face;
1977
2124 if (top == middle) 1978 if (top == middle)
2125 middle = blank_face; 1979 middle = blank_face;
2126 SET_MAP_FACE (m, x, y, top, 0);
2127 if (top != blank_face)
2128 SET_MAP_FACE_OBJ (m, x, y, top_obj, 0);
2129 else
2130 SET_MAP_FACE_OBJ (m, x, y, NULL, 0);
2131 SET_MAP_FACE (m, x, y, middle, 1);
2132 if (middle != blank_face)
2133 SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1);
2134 else
2135 SET_MAP_FACE_OBJ (m, x, y, NULL, 1);
2136 SET_MAP_FACE (m, x, y, floor, 2);
2137 if (floor != blank_face)
2138 SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2);
2139 else
2140 SET_MAP_FACE_OBJ (m, x, y, NULL, 2);
2141 SET_MAP_LIGHT (m, x, y, light);
2142}
2143 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}
2144 1985
2145void 1986void
2146set_map_reset_time (maptile *map) 1987set_map_reset_time (maptile *map)
2147{ 1988{
2148 int timeout; 1989 int timeout;
… …
2150 timeout = MAP_RESET_TIMEOUT (map); 1991 timeout = MAP_RESET_TIMEOUT (map);
2151 if (timeout <= 0) 1992 if (timeout <= 0)
2152 timeout = MAP_DEFAULTRESET; 1993 timeout = MAP_DEFAULTRESET;
2153 if (timeout >= MAP_MAXRESET) 1994 if (timeout >= MAP_MAXRESET)
2154 timeout = MAP_MAXRESET; 1995 timeout = MAP_MAXRESET;
2155 MAP_WHEN_RESET (map) = seconds () + timeout; 1996 MAP_WHEN_RESET (map) = time (0) + timeout;
2156} 1997}
2157 1998
2158/* 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
2159 * 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
2160 * 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
… …
2188 * 2029 *
2189 */ 2030 */
2190int 2031int
2191out_of_map (maptile *m, int x, int y) 2032out_of_map (maptile *m, int x, int y)
2192{ 2033{
2193
2194 /* If we get passed a null map, this is obviously the 2034 /* If we get passed a null map, this is obviously the
2195 * case. This generally shouldn't happen, but if the 2035 * case. This generally shouldn't happen, but if the
2196 * map loads fail below, it could happen. 2036 * map loads fail below, it could happen.
2197 */ 2037 */
2198 if (!m) 2038 if (!m)
… …
2200 2040
2201 if (x < 0) 2041 if (x < 0)
2202 { 2042 {
2203 if (!m->tile_path[3]) 2043 if (!m->tile_path[3])
2204 return 1; 2044 return 1;
2045
2205 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)
2206 {
2207 load_and_link_tiled_map (m, 3); 2047 load_and_link_tiled_map (m, 3);
2208 } 2048
2209 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 + MAP_WIDTH (m->tile_map[3]), y));
2210 } 2050 }
2051
2211 if (x >= MAP_WIDTH (m)) 2052 if (x >= MAP_WIDTH (m))
2212 { 2053 {
2213 if (!m->tile_path[1]) 2054 if (!m->tile_path[1])
2214 return 1; 2055 return 1;
2056
2215 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)
2216 {
2217 load_and_link_tiled_map (m, 1); 2058 load_and_link_tiled_map (m, 1);
2218 } 2059
2219 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); 2060 return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y));
2220 } 2061 }
2062
2221 if (y < 0) 2063 if (y < 0)
2222 { 2064 {
2223 if (!m->tile_path[0]) 2065 if (!m->tile_path[0])
2224 return 1; 2066 return 1;
2067
2225 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)
2226 {
2227 load_and_link_tiled_map (m, 0); 2069 load_and_link_tiled_map (m, 0);
2228 } 2070
2229 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 + MAP_HEIGHT (m->tile_map[0])));
2230 } 2072 }
2073
2231 if (y >= MAP_HEIGHT (m)) 2074 if (y >= MAP_HEIGHT (m))
2232 { 2075 {
2233 if (!m->tile_path[2]) 2076 if (!m->tile_path[2])
2234 return 1; 2077 return 1;
2078
2235 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)
2236 {
2237 load_and_link_tiled_map (m, 2); 2080 load_and_link_tiled_map (m, 2);
2238 } 2081
2239 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); 2082 return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m)));
2240 } 2083 }
2241 2084
2242 /* Simple case - coordinates are within this local 2085 /* Simple case - coordinates are within this local
2243 * map. 2086 * map.
… …
2258{ 2101{
2259 2102
2260 if (*x < 0) 2103 if (*x < 0)
2261 { 2104 {
2262 if (!m->tile_path[3]) 2105 if (!m->tile_path[3])
2263 return NULL; 2106 return 0;
2264 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)
2265 load_and_link_tiled_map (m, 3); 2108 load_and_link_tiled_map (m, 3);
2266 2109
2267 *x += MAP_WIDTH (m->tile_map[3]); 2110 *x += MAP_WIDTH (m->tile_map[3]);
2268 return (get_map_from_coord (m->tile_map[3], x, y)); 2111 return (get_map_from_coord (m->tile_map[3], x, y));
2269 } 2112 }
2113
2270 if (*x >= MAP_WIDTH (m)) 2114 if (*x >= MAP_WIDTH (m))
2271 { 2115 {
2272 if (!m->tile_path[1]) 2116 if (!m->tile_path[1])
2273 return NULL; 2117 return 0;
2118
2274 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)
2275 load_and_link_tiled_map (m, 1); 2120 load_and_link_tiled_map (m, 1);
2276 2121
2277 *x -= MAP_WIDTH (m); 2122 *x -= MAP_WIDTH (m);
2278 return (get_map_from_coord (m->tile_map[1], x, y)); 2123 return (get_map_from_coord (m->tile_map[1], x, y));
2279 } 2124 }
2125
2280 if (*y < 0) 2126 if (*y < 0)
2281 { 2127 {
2282 if (!m->tile_path[0]) 2128 if (!m->tile_path[0])
2283 return NULL; 2129 return 0;
2130
2284 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)
2285 load_and_link_tiled_map (m, 0); 2132 load_and_link_tiled_map (m, 0);
2286 2133
2287 *y += MAP_HEIGHT (m->tile_map[0]); 2134 *y += MAP_HEIGHT (m->tile_map[0]);
2288 return (get_map_from_coord (m->tile_map[0], x, y)); 2135 return (get_map_from_coord (m->tile_map[0], x, y));
2289 } 2136 }
2137
2290 if (*y >= MAP_HEIGHT (m)) 2138 if (*y >= MAP_HEIGHT (m))
2291 { 2139 {
2292 if (!m->tile_path[2]) 2140 if (!m->tile_path[2])
2293 return NULL; 2141 return 0;
2142
2294 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)
2295 load_and_link_tiled_map (m, 2); 2144 load_and_link_tiled_map (m, 2);
2296 2145
2297 *y -= MAP_HEIGHT (m); 2146 *y -= MAP_HEIGHT (m);
2298 return (get_map_from_coord (m->tile_map[2], x, y)); 2147 return (get_map_from_coord (m->tile_map[2], x, y));

Diff Legend

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