… | |
… | |
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 | */ |
… | |
… | |
157 | int |
154 | int |
158 | check_path (const char *name, int prepend_dir) |
155 | check_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 |
… | |
… | |
231 | void |
222 | void |
232 | dump_all_maps (void) |
223 | dump_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 | */ |
252 | int |
241 | int |
253 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) |
242 | get_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 | |
|
|
412 | int |
399 | int |
413 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
400 | ob_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); |
643 | |
628 | } |
644 | } /* for this space */ |
629 | } |
645 | } /* for this j */ |
|
|
646 | } |
630 | } |
647 | |
631 | |
648 | maptile::maptile () |
632 | maptile::maptile () |
649 | { |
633 | { |
650 | in_memory = MAP_SWAPPED; |
634 | in_memory = MAP_SWAPPED; |
… | |
… | |
700 | { |
684 | { |
701 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
685 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
702 | free (spaces); |
686 | free (spaces); |
703 | } |
687 | } |
704 | |
688 | |
705 | spaces = (MapSpace *) |
689 | spaces = (mapspace *) |
706 | calloc (1, width * height * sizeof (MapSpace)); |
690 | calloc (1, width * height * sizeof (mapspace)); |
707 | |
691 | |
708 | if (!spaces) |
692 | if (!spaces) |
709 | fatal (OUT_OF_MEMORY); |
693 | fatal (OUT_OF_MEMORY); |
710 | } |
694 | } |
711 | |
695 | |
… | |
… | |
737 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
721 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
738 | shopitems *items = NULL; |
722 | shopitems *items = NULL; |
739 | int i = 0, number_of_entries = 0; |
723 | int i = 0, number_of_entries = 0; |
740 | const typedata *current_type; |
724 | const typedata *current_type; |
741 | |
725 | |
742 | shop_string = strdup_local (input_string); |
726 | shop_string = strdup (input_string); |
743 | p = shop_string; |
727 | p = shop_string; |
744 | /* 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 */ |
745 | while (p) |
729 | while (p) |
746 | { |
730 | { |
747 | p = strchr (p, ';'); |
731 | p = strchr (p, ';'); |
… | |
… | |
860 | |
844 | |
861 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
845 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
862 | { |
846 | { |
863 | buf[HUGE_BUF - 1] = 0; |
847 | buf[HUGE_BUF - 1] = 0; |
864 | key = buf; |
848 | key = buf; |
|
|
849 | |
865 | while (isspace (*key)) |
850 | while (isspace (*key)) |
866 | key++; |
851 | key++; |
|
|
852 | |
867 | if (*key == 0) |
853 | if (*key == 0) |
868 | continue; /* empty line */ |
854 | continue; /* empty line */ |
|
|
855 | |
869 | value = strchr (key, ' '); |
856 | value = strchr (key, ' '); |
|
|
857 | |
870 | if (!value) |
858 | if (!value) |
871 | { |
859 | { |
872 | end = strchr (key, '\n'); |
860 | if ((end = strchr (key, '\n'))) |
873 | if (end != NULL) |
|
|
874 | { |
|
|
875 | *end = 0; |
861 | *end = 0; |
876 | } |
|
|
877 | } |
862 | } |
878 | else |
863 | else |
879 | { |
864 | { |
880 | *value = 0; |
865 | *value = 0; |
881 | value++; |
866 | value++; |
882 | end = strchr (value, '\n'); |
867 | end = strchr (value, '\n'); |
|
|
868 | |
883 | while (isspace (*value)) |
869 | while (isspace (*value)) |
884 | { |
870 | { |
885 | value++; |
871 | value++; |
|
|
872 | |
886 | if (*value == '\0' || value == end) |
873 | if (*value == '\0' || value == end) |
887 | { |
874 | { |
888 | /* Nothing but spaces. */ |
875 | /* Nothing but spaces. */ |
889 | value = NULL; |
876 | value = NULL; |
890 | break; |
877 | break; |
… | |
… | |
930 | * with nothing between). There is no reason in those cases to |
917 | * with nothing between). There is no reason in those cases to |
931 | * keep the empty message. Also, msgbuf contains garbage data |
918 | * keep the empty message. Also, msgbuf contains garbage data |
932 | * when msgpos is zero, so copying it results in crashes |
919 | * when msgpos is zero, so copying it results in crashes |
933 | */ |
920 | */ |
934 | if (msgpos != 0) |
921 | if (msgpos != 0) |
935 | m->msg = strdup_local (msgbuf); |
922 | m->msg = strdup (msgbuf); |
936 | } |
923 | } |
937 | else if (!strcmp (key, "maplore")) |
924 | else if (!strcmp (key, "maplore")) |
938 | { |
925 | { |
939 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
926 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
940 | { |
927 | { |
… | |
… | |
946 | strcpy (maplorebuf + maplorepos, buf); |
933 | strcpy (maplorebuf + maplorepos, buf); |
947 | maplorepos += strlen (buf); |
934 | maplorepos += strlen (buf); |
948 | } |
935 | } |
949 | } |
936 | } |
950 | if (maplorepos != 0) |
937 | if (maplorepos != 0) |
951 | m->maplore = strdup_local (maplorebuf); |
938 | m->maplore = strdup (maplorebuf); |
952 | } |
939 | } |
953 | else if (!strcmp (key, "end")) |
940 | else if (!strcmp (key, "end")) |
954 | { |
941 | { |
955 | break; |
942 | break; |
956 | } |
943 | } |
… | |
… | |
965 | 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); |
966 | } |
953 | } |
967 | else if (!strcmp (key, "name")) |
954 | else if (!strcmp (key, "name")) |
968 | { |
955 | { |
969 | *end = 0; |
956 | *end = 0; |
970 | m->name = strdup_local (value); |
957 | m->name = strdup (value); |
971 | } |
958 | } |
972 | /* first strcmp value on these are old names supported |
959 | /* first strcmp value on these are old names supported |
973 | * for compatibility reasons. The new values (second) are |
960 | * for compatibility reasons. The new values (second) are |
974 | * what really should be used. |
961 | * what really should be used. |
975 | */ |
962 | */ |
976 | else if (!strcmp (key, "oid")) |
963 | else if (!strcmp (key, "oid")) |
977 | { |
|
|
978 | fp.get (m, atoi (value)); |
964 | fp.get (m, atoi (value)); |
979 | } |
|
|
980 | else if (!strcmp (key, "attach")) |
965 | else if (!strcmp (key, "attach")) |
981 | { |
|
|
982 | m->attach = value; |
966 | m->attach = value; |
983 | } |
|
|
984 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
967 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
985 | { |
|
|
986 | m->enter_x = atoi (value); |
968 | m->enter_x = atoi (value); |
987 | } |
|
|
988 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
969 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
989 | { |
|
|
990 | m->enter_y = atoi (value); |
970 | m->enter_y = atoi (value); |
991 | } |
|
|
992 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
971 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
993 | { |
|
|
994 | m->width = atoi (value); |
972 | m->width = atoi (value); |
995 | } |
|
|
996 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
973 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
997 | { |
|
|
998 | m->height = atoi (value); |
974 | m->height = atoi (value); |
999 | } |
|
|
1000 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
975 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
1001 | { |
|
|
1002 | m->reset_timeout = atoi (value); |
976 | m->reset_timeout = atoi (value); |
1003 | } |
|
|
1004 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
977 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
1005 | { |
|
|
1006 | m->timeout = atoi (value); |
978 | m->timeout = atoi (value); |
1007 | } |
|
|
1008 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
979 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
1009 | { |
980 | m->difficulty = clamp (atoi (value), 1, settings.max_level); |
1010 | m->difficulty = atoi (value); |
|
|
1011 | } |
|
|
1012 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
981 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
1013 | { |
|
|
1014 | m->darkness = atoi (value); |
982 | m->darkness = atoi (value); |
1015 | } |
|
|
1016 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
983 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
1017 | { |
|
|
1018 | m->fixed_resettime = atoi (value); |
984 | m->fixed_resettime = atoi (value); |
1019 | } |
|
|
1020 | else if (!strcmp (key, "unique")) |
985 | else if (!strcmp (key, "unique")) |
1021 | { |
|
|
1022 | m->unique = atoi (value); |
986 | m->unique = atoi (value); |
1023 | } |
|
|
1024 | else if (!strcmp (key, "template")) |
987 | else if (!strcmp (key, "template")) |
1025 | { |
|
|
1026 | m->templatemap = atoi (value); |
988 | m->templatemap = atoi (value); |
1027 | } |
|
|
1028 | else if (!strcmp (key, "region")) |
989 | else if (!strcmp (key, "region")) |
1029 | { |
|
|
1030 | m->region = get_region_by_name (value); |
990 | m->region = get_region_by_name (value); |
1031 | } |
|
|
1032 | else if (!strcmp (key, "shopitems")) |
991 | else if (!strcmp (key, "shopitems")) |
1033 | { |
992 | { |
1034 | *end = 0; |
993 | *end = 0; |
1035 | m->shopitems = parse_shop_string (value); |
994 | m->shopitems = parse_shop_string (value); |
1036 | } |
995 | } |
1037 | else if (!strcmp (key, "shopgreed")) |
996 | else if (!strcmp (key, "shopgreed")) |
1038 | { |
|
|
1039 | m->shopgreed = atof (value); |
997 | m->shopgreed = atof (value); |
1040 | } |
|
|
1041 | else if (!strcmp (key, "shopmin")) |
998 | else if (!strcmp (key, "shopmin")) |
1042 | { |
|
|
1043 | m->shopmin = atol (value); |
999 | m->shopmin = atol (value); |
1044 | } |
|
|
1045 | else if (!strcmp (key, "shopmax")) |
1000 | else if (!strcmp (key, "shopmax")) |
1046 | { |
|
|
1047 | m->shopmax = atol (value); |
1001 | m->shopmax = atol (value); |
1048 | } |
|
|
1049 | else if (!strcmp (key, "shoprace")) |
1002 | else if (!strcmp (key, "shoprace")) |
1050 | { |
1003 | { |
1051 | *end = 0; |
1004 | *end = 0; |
1052 | m->shoprace = strdup_local (value); |
1005 | m->shoprace = strdup (value); |
1053 | } |
1006 | } |
1054 | else if (!strcmp (key, "outdoor")) |
1007 | else if (!strcmp (key, "outdoor")) |
1055 | { |
|
|
1056 | m->outdoor = atoi (value); |
1008 | m->outdoor = atoi (value); |
1057 | } |
|
|
1058 | else if (!strcmp (key, "temp")) |
1009 | else if (!strcmp (key, "temp")) |
1059 | { |
|
|
1060 | m->temp = atoi (value); |
1010 | m->temp = atoi (value); |
1061 | } |
|
|
1062 | else if (!strcmp (key, "pressure")) |
1011 | else if (!strcmp (key, "pressure")) |
1063 | { |
|
|
1064 | m->pressure = atoi (value); |
1012 | m->pressure = atoi (value); |
1065 | } |
|
|
1066 | else if (!strcmp (key, "humid")) |
1013 | else if (!strcmp (key, "humid")) |
1067 | { |
|
|
1068 | m->humid = atoi (value); |
1014 | m->humid = atoi (value); |
1069 | } |
|
|
1070 | else if (!strcmp (key, "windspeed")) |
1015 | else if (!strcmp (key, "windspeed")) |
1071 | { |
|
|
1072 | m->windspeed = atoi (value); |
1016 | m->windspeed = atoi (value); |
1073 | } |
|
|
1074 | else if (!strcmp (key, "winddir")) |
1017 | else if (!strcmp (key, "winddir")) |
1075 | { |
|
|
1076 | m->winddir = atoi (value); |
1018 | m->winddir = atoi (value); |
1077 | } |
|
|
1078 | else if (!strcmp (key, "sky")) |
1019 | else if (!strcmp (key, "sky")) |
1079 | { |
|
|
1080 | m->sky = atoi (value); |
1020 | m->sky = atoi (value); |
1081 | } |
|
|
1082 | else if (!strcmp (key, "nosmooth")) |
1021 | else if (!strcmp (key, "nosmooth")) |
1083 | { |
|
|
1084 | m->nosmooth = atoi (value); |
1022 | m->nosmooth = atoi (value); |
1085 | } |
|
|
1086 | else if (!strncmp (key, "tile_path_", 10)) |
1023 | else if (!strncmp (key, "tile_path_", 10)) |
1087 | { |
1024 | { |
1088 | int tile = atoi (key + 10); |
1025 | int tile = atoi (key + 10); |
1089 | |
1026 | |
1090 | if (tile < 1 || tile > 4) |
1027 | if (tile < 1 || tile > 4) |
… | |
… | |
1123 | } |
1060 | } |
1124 | |
1061 | |
1125 | if (editor) |
1062 | if (editor) |
1126 | { |
1063 | { |
1127 | /* Use the value as in the file. */ |
1064 | /* Use the value as in the file. */ |
1128 | m->tile_path[tile - 1] = strdup_local (value); |
1065 | m->tile_path[tile - 1] = strdup (value); |
1129 | } |
1066 | } |
1130 | else if (path != NULL) |
1067 | else if (path != NULL) |
1131 | { |
1068 | { |
1132 | /* Use the normalized value. */ |
1069 | /* Use the normalized value. */ |
1133 | m->tile_path[tile - 1] = strdup_local (path); |
1070 | m->tile_path[tile - 1] = strdup (path); |
1134 | } |
1071 | } |
1135 | } /* end if tile direction (in)valid */ |
1072 | } /* end if tile direction (in)valid */ |
1136 | } |
1073 | } |
1137 | else |
1074 | else |
1138 | { |
|
|
1139 | 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); |
1140 | } |
|
|
1141 | } |
1076 | } |
|
|
1077 | |
1142 | if (!key || strcmp (key, "end")) |
1078 | if (!key || strcmp (key, "end")) |
1143 | { |
1079 | { |
1144 | LOG (llevError, "Got premature eof on map header!\n"); |
1080 | LOG (llevError, "Got premature eof on map header!\n"); |
1145 | return 1; |
1081 | return 1; |
1146 | } |
1082 | } |
|
|
1083 | |
1147 | return 0; |
1084 | return 0; |
1148 | } |
1085 | } |
1149 | |
1086 | |
1150 | /* |
1087 | /* |
1151 | * Opens the file "filename" and reads information about the map |
1088 | * Opens the file "filename" and reads information about the map |
… | |
… | |
1303 | |
1240 | |
1304 | for (i = 0; i < MAP_WIDTH (m); i++) |
1241 | for (i = 0; i < MAP_WIDTH (m); i++) |
1305 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1242 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1306 | { |
1243 | { |
1307 | unique = 0; |
1244 | unique = 0; |
|
|
1245 | |
1308 | for (op = get_map_ob (m, i, j); op; op = next) |
1246 | for (op = GET_MAP_OB (m, i, j); op; op = next) |
1309 | { |
1247 | { |
1310 | next = op->above; |
1248 | next = op->above; |
|
|
1249 | |
1311 | 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)) |
1312 | unique = 1; |
1251 | unique = 1; |
|
|
1252 | |
1313 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1253 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1314 | { |
1254 | { |
1315 | clean_object (op); |
1255 | clean_object (op); |
|
|
1256 | |
1316 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
1257 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
1317 | remove_button_link (op); |
1258 | remove_button_link (op); |
1318 | remove_ob (op); |
1259 | |
1319 | free_object (op); |
1260 | op->destroy (); |
1320 | } |
1261 | } |
1321 | } |
1262 | } |
1322 | } |
1263 | } |
1323 | } |
1264 | } |
1324 | |
1265 | |
… | |
… | |
1393 | make_path_to_file (filename); |
1334 | make_path_to_file (filename); |
1394 | } |
1335 | } |
1395 | else |
1336 | else |
1396 | { |
1337 | { |
1397 | if (!m->tmpname) |
1338 | if (!m->tmpname) |
1398 | m->tmpname = tempnam_local (settings.tmpdir, NULL); |
1339 | m->tmpname = tempnam (settings.tmpdir, NULL); |
1399 | |
1340 | |
1400 | strcpy (filename, m->tmpname); |
1341 | strcpy (filename, m->tmpname); |
1401 | } |
1342 | } |
1402 | |
1343 | |
1403 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
1344 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
… | |
… | |
1427 | print_shop_string (m, shop); |
1368 | print_shop_string (m, shop); |
1428 | fprintf (freezer, "shopitems %s\n", shop); |
1369 | fprintf (freezer, "shopitems %s\n", shop); |
1429 | } |
1370 | } |
1430 | if (m->shopgreed) |
1371 | if (m->shopgreed) |
1431 | fprintf (freezer, "shopgreed %f\n", m->shopgreed); |
1372 | fprintf (freezer, "shopgreed %f\n", m->shopgreed); |
1432 | #ifndef WIN32 |
|
|
1433 | if (m->shopmin) |
1373 | if (m->shopmin) |
1434 | fprintf (freezer, "shopmin %llu\n", m->shopmin); |
1374 | fprintf (freezer, "shopmin %llu\n", m->shopmin); |
1435 | if (m->shopmax) |
1375 | if (m->shopmax) |
1436 | fprintf (freezer, "shopmax %llu\n", m->shopmax); |
1376 | 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) |
1377 | if (m->shoprace) |
1444 | fprintf (freezer, "shoprace %s\n", m->shoprace); |
1378 | fprintf (freezer, "shoprace %s\n", m->shoprace); |
1445 | if (m->darkness) |
1379 | if (m->darkness) |
1446 | fprintf (freezer, "darkness %d\n", m->darkness); |
1380 | fprintf (freezer, "darkness %d\n", m->darkness); |
1447 | if (m->width) |
1381 | if (m->width) |
… | |
… | |
1526 | object *tmp, *next; |
1460 | object *tmp, *next; |
1527 | |
1461 | |
1528 | for (tmp = op->inv; tmp; tmp = next) |
1462 | for (tmp = op->inv; tmp; tmp = next) |
1529 | { |
1463 | { |
1530 | next = tmp->below; |
1464 | next = tmp->below; |
|
|
1465 | |
1531 | clean_object (tmp); |
1466 | clean_object (tmp); |
1532 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
1467 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
1533 | remove_button_link (tmp); |
1468 | remove_button_link (tmp); |
1534 | remove_ob (tmp); |
1469 | |
1535 | free_object (tmp); |
1470 | tmp->destroy (); |
1536 | } |
1471 | } |
1537 | } |
1472 | } |
1538 | |
1473 | |
1539 | /* |
1474 | /* |
1540 | * Remove and free all objects in the given map. |
1475 | * Remove and free all objects in the given map. |
… | |
… | |
1556 | if (op == previous_obj) |
1491 | if (op == previous_obj) |
1557 | { |
1492 | { |
1558 | LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); |
1493 | LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); |
1559 | break; |
1494 | break; |
1560 | } |
1495 | } |
|
|
1496 | |
1561 | previous_obj = op; |
1497 | previous_obj = op; |
|
|
1498 | |
1562 | if (op->head != NULL) |
1499 | if (op->head != NULL) |
1563 | op = op->head; |
1500 | op = op->head; |
1564 | |
1501 | |
1565 | /* 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 |
1566 | * 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. |
1567 | */ |
1504 | */ |
1568 | if (m->in_memory == MAP_IN_MEMORY) |
1505 | if (m->in_memory == MAP_IN_MEMORY) |
1569 | clean_object (op); |
1506 | clean_object (op); |
1570 | remove_ob (op); |
1507 | |
1571 | free_object (op); |
1508 | op->destroy (); |
1572 | } |
1509 | } |
1573 | } |
1510 | } |
1574 | } |
1511 | } |
1575 | |
1512 | |
1576 | /* |
1513 | /* |
… | |
… | |
1586 | if (!m->in_memory) |
1523 | if (!m->in_memory) |
1587 | { |
1524 | { |
1588 | LOG (llevError, "Trying to free freed map.\n"); |
1525 | LOG (llevError, "Trying to free freed map.\n"); |
1589 | return; |
1526 | return; |
1590 | } |
1527 | } |
|
|
1528 | |
|
|
1529 | // TODO: use new/delete |
|
|
1530 | #define FREE_AND_CLEAR(p) { free (p); p = NULL; } |
|
|
1531 | |
1591 | if (flag && m->spaces) |
1532 | if (flag && m->spaces) |
1592 | free_all_objects (m); |
1533 | free_all_objects (m); |
1593 | if (m->name) |
1534 | if (m->name) |
1594 | FREE_AND_CLEAR (m->name); |
1535 | FREE_AND_CLEAR (m->name); |
1595 | if (m->spaces) |
1536 | if (m->spaces) |
1596 | FREE_AND_CLEAR (m->spaces); |
1537 | FREE_AND_CLEAR (m->spaces); |
1597 | if (m->msg) |
1538 | if (m->msg) |
1598 | FREE_AND_CLEAR (m->msg); |
1539 | FREE_AND_CLEAR (m->msg); |
1599 | if (m->maplore) |
1540 | if (m->maplore) |
1600 | FREE_AND_CLEAR (m->maplore); |
1541 | FREE_AND_CLEAR (m->maplore); |
1601 | if (m->shopitems) |
1542 | |
1602 | delete[]m->shopitems; |
1543 | delete [] m->shopitems; |
1603 | m->shopitems = 0; |
1544 | m->shopitems = 0; |
|
|
1545 | |
1604 | if (m->shoprace) |
1546 | if (m->shoprace) |
1605 | FREE_AND_CLEAR (m->shoprace); |
1547 | FREE_AND_CLEAR (m->shoprace); |
|
|
1548 | |
1606 | if (m->buttons) |
1549 | if (m->buttons) |
1607 | free_objectlinkpt (m->buttons); |
1550 | free_objectlinkpt (m->buttons); |
|
|
1551 | |
1608 | m->buttons = NULL; |
1552 | m->buttons = NULL; |
|
|
1553 | |
1609 | for (i = 0; i < 4; i++) |
1554 | for (i = 0; i < 4; i++) |
1610 | { |
1555 | { |
1611 | if (m->tile_path[i]) |
1556 | if (m->tile_path[i]) |
1612 | FREE_AND_CLEAR (m->tile_path[i]); |
1557 | FREE_AND_CLEAR (m->tile_path[i]); |
1613 | m->tile_map[i] = NULL; |
1558 | m->tile_map[i] = NULL; |
1614 | } |
1559 | } |
|
|
1560 | |
1615 | m->in_memory = MAP_SWAPPED; |
1561 | m->in_memory = MAP_SWAPPED; |
|
|
1562 | |
|
|
1563 | #undef FREE_AND_CLEAR |
|
|
1564 | |
1616 | } |
1565 | } |
1617 | |
1566 | |
1618 | /* |
1567 | /* |
1619 | * function: vanish maptile |
1568 | * function: vanish maptile |
1620 | * m : pointer to maptile, if NULL no action |
1569 | * m : pointer to maptile, if NULL no action |
… | |
… | |
1680 | else |
1629 | else |
1681 | last->next = m->next; |
1630 | last->next = m->next; |
1682 | |
1631 | |
1683 | delete m; |
1632 | delete m; |
1684 | } |
1633 | } |
1685 | |
|
|
1686 | |
|
|
1687 | |
1634 | |
1688 | /* |
1635 | /* |
1689 | * Makes sure the given map is loaded and swapped in. |
1636 | * Makes sure the given map is loaded and swapped in. |
1690 | * name is path name of the map. |
1637 | * name is path name of the map. |
1691 | * flags meaning: |
1638 | * flags meaning: |
… | |
… | |
1694 | * 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. |
1695 | * dont do any more name translation on it. |
1642 | * dont do any more name translation on it. |
1696 | * |
1643 | * |
1697 | * Returns a pointer to the given map. |
1644 | * Returns a pointer to the given map. |
1698 | */ |
1645 | */ |
1699 | |
|
|
1700 | maptile * |
1646 | maptile * |
1701 | ready_map_name (const char *name, int flags) |
1647 | ready_map_name (const char *name, int flags) |
1702 | { |
1648 | { |
1703 | maptile *m; |
1649 | maptile *m; |
1704 | |
1650 | |
… | |
… | |
1827 | return MAP_DIFFICULTY (m); |
1773 | return MAP_DIFFICULTY (m); |
1828 | } |
1774 | } |
1829 | |
1775 | |
1830 | for (x = 0; x < MAP_WIDTH (m); x++) |
1776 | for (x = 0; x < MAP_WIDTH (m); x++) |
1831 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1777 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1832 | 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) |
1833 | { |
1779 | { |
1834 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1780 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1835 | { |
1781 | { |
1836 | total_exp += op->stats.exp; |
1782 | total_exp += op->stats.exp; |
1837 | monster_cnt++; |
1783 | monster_cnt++; |
… | |
… | |
1930 | /* All clients need to get re-updated for the change */ |
1876 | /* All clients need to get re-updated for the change */ |
1931 | update_all_map_los (m); |
1877 | update_all_map_los (m); |
1932 | return 1; |
1878 | return 1; |
1933 | } |
1879 | } |
1934 | |
1880 | |
1935 | |
|
|
1936 | /* |
1881 | /* |
1937 | * This function updates various attributes about a specific space |
1882 | * This function updates various attributes about a specific space |
1938 | * on the map (what it looks like, whether it blocks magic, |
1883 | * on the map (what it looks like, whether it blocks magic, |
1939 | * has a living creatures, prevents people from passing |
1884 | * has a living creatures, prevents people from passing |
1940 | * through, etc) |
1885 | * through, etc) |
1941 | */ |
1886 | */ |
1942 | void |
1887 | void |
1943 | update_position (maptile *m, int x, int y) |
1888 | mapspace::update_ () |
1944 | { |
1889 | { |
1945 | object *tmp, *last = NULL; |
1890 | object *tmp, *last = 0; |
1946 | uint8 flags = 0, oldflags, light = 0, anywhere = 0; |
1891 | uint8 flags = 0, light = 0, anywhere = 0; |
1947 | New_Face *top, *floor, *middle; |
1892 | New_Face *top, *floor, *middle; |
1948 | object *top_obj, *floor_obj, *middle_obj; |
1893 | object *top_obj, *floor_obj, *middle_obj; |
1949 | 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; |
1950 | |
1895 | |
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; |
1896 | middle = blank_face; |
1959 | top = blank_face; |
1897 | top = blank_face; |
1960 | floor = blank_face; |
1898 | floor = blank_face; |
1961 | |
1899 | |
1962 | middle_obj = NULL; |
1900 | middle_obj = 0; |
1963 | top_obj = NULL; |
1901 | top_obj = 0; |
1964 | floor_obj = NULL; |
1902 | floor_obj = 0; |
1965 | |
1903 | |
1966 | for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) |
1904 | for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) |
1967 | { |
1905 | { |
1968 | |
|
|
1969 | /* This could be made additive I guess (two lights better than |
1906 | /* This could be made additive I guess (two lights better than |
1970 | * 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 |
1971 | * light bulbs do not illuminate twice as far as once since |
1908 | * light bulbs do not illuminate twice as far as once since |
1972 | * it is a disapation factor that is squared (or is it cubed?) |
1909 | * it is a dissapation factor that is cubed. |
1973 | */ |
1910 | */ |
1974 | if (tmp->glow_radius > light) |
1911 | if (tmp->glow_radius > light) |
1975 | light = tmp->glow_radius; |
1912 | light = tmp->glow_radius; |
1976 | |
1913 | |
1977 | /* This call is needed in order to update objects the player |
1914 | /* This call is needed in order to update objects the player |
… | |
… | |
2015 | { |
1952 | { |
2016 | middle = tmp->face; |
1953 | middle = tmp->face; |
2017 | middle_obj = tmp; |
1954 | middle_obj = tmp; |
2018 | } |
1955 | } |
2019 | } |
1956 | } |
|
|
1957 | |
2020 | if (tmp == tmp->above) |
1958 | if (tmp == tmp->above) |
2021 | { |
1959 | { |
2022 | LOG (llevError, "Error in structure of map\n"); |
1960 | LOG (llevError, "Error in structure of map\n"); |
2023 | exit (-1); |
1961 | exit (-1); |
2024 | } |
1962 | } |
2025 | |
1963 | |
2026 | move_slow |= tmp->move_slow; |
1964 | move_slow |= tmp->move_slow; |
2027 | move_block |= tmp->move_block; |
1965 | move_block |= tmp->move_block; |
2028 | move_on |= tmp->move_on; |
1966 | move_on |= tmp->move_on; |
2029 | move_off |= tmp->move_off; |
1967 | move_off |= tmp->move_off; |
2030 | move_allow |= tmp->move_allow; |
1968 | move_allow |= tmp->move_allow; |
2031 | |
1969 | |
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)) |
1970 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; |
2042 | flags |= P_BLOCKSVIEW; |
1971 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; |
2043 | } /* for stack of objects */ |
1972 | if (tmp->type == PLAYER) flags |= P_PLAYER; |
2044 | |
1973 | if (tmp->type == SAFE_GROUND) flags |= P_SAFE; |
2045 | /* 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; |
2046 | * since we're already doing the work, we calculate them here. |
1975 | 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 | { |
1976 | } |
2051 | LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", |
1977 | |
2052 | m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); |
1978 | this->light = light; |
2053 | } |
1979 | this->flags_ = flags; |
2054 | SET_MAP_FLAGS (m, x, y, flags); |
1980 | this->move_block = move_block & ~move_allow; |
2055 | SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); |
1981 | this->move_on = move_on; |
2056 | SET_MAP_MOVE_ON (m, x, y, move_on); |
1982 | this->move_off = move_off; |
2057 | SET_MAP_MOVE_OFF (m, x, y, move_off); |
1983 | this->move_slow = move_slow; |
2058 | SET_MAP_MOVE_SLOW (m, x, y, move_slow); |
|
|
2059 | |
1984 | |
2060 | /* 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), |
2061 | * 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 |
2062 | * this point. |
1987 | * this point. |
2063 | * middle contains the highest visibility face. |
1988 | * middle contains the highest visibility face. |
… | |
… | |
2117 | break; |
2042 | break; |
2118 | } |
2043 | } |
2119 | } |
2044 | } |
2120 | } |
2045 | } |
2121 | } |
2046 | } |
|
|
2047 | |
2122 | if (middle == floor) |
2048 | if (middle == floor) |
2123 | middle = blank_face; |
2049 | middle = blank_face; |
|
|
2050 | |
2124 | if (top == middle) |
2051 | if (top == middle) |
2125 | middle = blank_face; |
2052 | 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 | |
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 | } |
2144 | |
2058 | |
2145 | void |
2059 | void |
2146 | set_map_reset_time (maptile *map) |
2060 | set_map_reset_time (maptile *map) |
2147 | { |
2061 | { |
2148 | int timeout; |
2062 | int timeout; |
… | |
… | |
2150 | timeout = MAP_RESET_TIMEOUT (map); |
2064 | timeout = MAP_RESET_TIMEOUT (map); |
2151 | if (timeout <= 0) |
2065 | if (timeout <= 0) |
2152 | timeout = MAP_DEFAULTRESET; |
2066 | timeout = MAP_DEFAULTRESET; |
2153 | if (timeout >= MAP_MAXRESET) |
2067 | if (timeout >= MAP_MAXRESET) |
2154 | timeout = MAP_MAXRESET; |
2068 | timeout = MAP_MAXRESET; |
2155 | MAP_WHEN_RESET (map) = seconds () + timeout; |
2069 | MAP_WHEN_RESET (map) = time (0) + timeout; |
2156 | } |
2070 | } |
2157 | |
2071 | |
2158 | /* 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 |
2159 | * 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 |
2160 | * 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 |
… | |
… | |
2188 | * |
2102 | * |
2189 | */ |
2103 | */ |
2190 | int |
2104 | int |
2191 | out_of_map (maptile *m, int x, int y) |
2105 | out_of_map (maptile *m, int x, int y) |
2192 | { |
2106 | { |
2193 | |
|
|
2194 | /* If we get passed a null map, this is obviously the |
2107 | /* If we get passed a null map, this is obviously the |
2195 | * case. This generally shouldn't happen, but if the |
2108 | * case. This generally shouldn't happen, but if the |
2196 | * map loads fail below, it could happen. |
2109 | * map loads fail below, it could happen. |
2197 | */ |
2110 | */ |
2198 | if (!m) |
2111 | if (!m) |
… | |
… | |
2200 | |
2113 | |
2201 | if (x < 0) |
2114 | if (x < 0) |
2202 | { |
2115 | { |
2203 | if (!m->tile_path[3]) |
2116 | if (!m->tile_path[3]) |
2204 | return 1; |
2117 | return 1; |
|
|
2118 | |
2205 | 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) |
2206 | { |
|
|
2207 | load_and_link_tiled_map (m, 3); |
2120 | load_and_link_tiled_map (m, 3); |
2208 | } |
2121 | |
2209 | 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)); |
2210 | } |
2123 | } |
|
|
2124 | |
2211 | if (x >= MAP_WIDTH (m)) |
2125 | if (x >= MAP_WIDTH (m)) |
2212 | { |
2126 | { |
2213 | if (!m->tile_path[1]) |
2127 | if (!m->tile_path[1]) |
2214 | return 1; |
2128 | return 1; |
|
|
2129 | |
2215 | 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) |
2216 | { |
|
|
2217 | load_and_link_tiled_map (m, 1); |
2131 | load_and_link_tiled_map (m, 1); |
2218 | } |
2132 | |
2219 | 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)); |
2220 | } |
2134 | } |
|
|
2135 | |
2221 | if (y < 0) |
2136 | if (y < 0) |
2222 | { |
2137 | { |
2223 | if (!m->tile_path[0]) |
2138 | if (!m->tile_path[0]) |
2224 | return 1; |
2139 | return 1; |
|
|
2140 | |
2225 | 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) |
2226 | { |
|
|
2227 | load_and_link_tiled_map (m, 0); |
2142 | load_and_link_tiled_map (m, 0); |
2228 | } |
2143 | |
2229 | 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]))); |
2230 | } |
2145 | } |
|
|
2146 | |
2231 | if (y >= MAP_HEIGHT (m)) |
2147 | if (y >= MAP_HEIGHT (m)) |
2232 | { |
2148 | { |
2233 | if (!m->tile_path[2]) |
2149 | if (!m->tile_path[2]) |
2234 | return 1; |
2150 | return 1; |
|
|
2151 | |
2235 | 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) |
2236 | { |
|
|
2237 | load_and_link_tiled_map (m, 2); |
2153 | load_and_link_tiled_map (m, 2); |
2238 | } |
2154 | |
2239 | 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))); |
2240 | } |
2156 | } |
2241 | |
2157 | |
2242 | /* Simple case - coordinates are within this local |
2158 | /* Simple case - coordinates are within this local |
2243 | * map. |
2159 | * map. |
… | |
… | |
2258 | { |
2174 | { |
2259 | |
2175 | |
2260 | if (*x < 0) |
2176 | if (*x < 0) |
2261 | { |
2177 | { |
2262 | if (!m->tile_path[3]) |
2178 | if (!m->tile_path[3]) |
2263 | return NULL; |
2179 | return 0; |
2264 | 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) |
2265 | load_and_link_tiled_map (m, 3); |
2181 | load_and_link_tiled_map (m, 3); |
2266 | |
2182 | |
2267 | *x += MAP_WIDTH (m->tile_map[3]); |
2183 | *x += MAP_WIDTH (m->tile_map[3]); |
2268 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2184 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2269 | } |
2185 | } |
|
|
2186 | |
2270 | if (*x >= MAP_WIDTH (m)) |
2187 | if (*x >= MAP_WIDTH (m)) |
2271 | { |
2188 | { |
2272 | if (!m->tile_path[1]) |
2189 | if (!m->tile_path[1]) |
2273 | return NULL; |
2190 | return 0; |
|
|
2191 | |
2274 | 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) |
2275 | load_and_link_tiled_map (m, 1); |
2193 | load_and_link_tiled_map (m, 1); |
2276 | |
2194 | |
2277 | *x -= MAP_WIDTH (m); |
2195 | *x -= MAP_WIDTH (m); |
2278 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2196 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2279 | } |
2197 | } |
|
|
2198 | |
2280 | if (*y < 0) |
2199 | if (*y < 0) |
2281 | { |
2200 | { |
2282 | if (!m->tile_path[0]) |
2201 | if (!m->tile_path[0]) |
2283 | return NULL; |
2202 | return 0; |
|
|
2203 | |
2284 | 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) |
2285 | load_and_link_tiled_map (m, 0); |
2205 | load_and_link_tiled_map (m, 0); |
2286 | |
2206 | |
2287 | *y += MAP_HEIGHT (m->tile_map[0]); |
2207 | *y += MAP_HEIGHT (m->tile_map[0]); |
2288 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2208 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2289 | } |
2209 | } |
|
|
2210 | |
2290 | if (*y >= MAP_HEIGHT (m)) |
2211 | if (*y >= MAP_HEIGHT (m)) |
2291 | { |
2212 | { |
2292 | if (!m->tile_path[2]) |
2213 | if (!m->tile_path[2]) |
2293 | return NULL; |
2214 | return 0; |
|
|
2215 | |
2294 | 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) |
2295 | load_and_link_tiled_map (m, 2); |
2217 | load_and_link_tiled_map (m, 2); |
2296 | |
2218 | |
2297 | *y -= MAP_HEIGHT (m); |
2219 | *y -= MAP_HEIGHT (m); |
2298 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2220 | return (get_map_from_coord (m->tile_map[2], x, y)); |