… | |
… | |
27 | |
27 | |
28 | #include <loader.h> |
28 | #include <loader.h> |
29 | #include <unistd.h> |
29 | #include <unistd.h> |
30 | |
30 | |
31 | #include "path.h" |
31 | #include "path.h" |
32 | |
|
|
33 | |
32 | |
34 | /* |
33 | /* |
35 | * Returns the maptile which has a name matching the given argument. |
34 | * Returns the maptile which has a name matching the given argument. |
36 | * return NULL if no match is found. |
35 | * return NULL if no match is found. |
37 | */ |
36 | */ |
… | |
… | |
223 | void |
222 | void |
224 | dump_all_maps (void) |
223 | dump_all_maps (void) |
225 | { |
224 | { |
226 | maptile *m; |
225 | maptile *m; |
227 | |
226 | |
228 | for (m = first_map; m != NULL; m = m->next) |
227 | for (m = first_map; m; m = m->next) |
229 | { |
|
|
230 | dump_map (m); |
228 | dump_map (m); |
231 | } |
|
|
232 | } |
229 | } |
233 | |
230 | |
234 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
231 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
235 | * one function that just returns a P_.. value (see map.h) |
232 | * one function that just returns a P_.. value (see map.h) |
236 | * it will also do map translation for tiled maps, returning |
233 | * it will also do map translation for tiled maps, returning |
… | |
… | |
240 | * is needed. The case of not passing values is if we're just |
237 | * is needed. The case of not passing values is if we're just |
241 | * checking for the existence of something on those spaces, but |
238 | * checking for the existence of something on those spaces, but |
242 | * don't expect to insert/remove anything from those spaces. |
239 | * don't expect to insert/remove anything from those spaces. |
243 | */ |
240 | */ |
244 | int |
241 | int |
245 | 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) |
246 | { |
243 | { |
247 | sint16 newx, newy; |
244 | sint16 newx, newy; |
248 | int retval = 0; |
245 | int retval = 0; |
249 | maptile *mp; |
246 | maptile *mp; |
250 | |
247 | |
251 | if (out_of_map (oldmap, x, y)) |
|
|
252 | return P_OUT_OF_MAP; |
|
|
253 | newx = x; |
248 | newx = x; |
254 | newy = y; |
249 | newy = y; |
|
|
250 | |
255 | mp = get_map_from_coord (oldmap, &newx, &newy); |
251 | mp = get_map_from_coord (oldmap, &newx, &newy); |
|
|
252 | |
|
|
253 | if (!mp) |
|
|
254 | return P_OUT_OF_MAP; |
|
|
255 | |
256 | if (mp != oldmap) |
256 | if (mp != oldmap) |
257 | retval |= P_NEW_MAP; |
257 | retval |= P_NEW_MAP; |
258 | if (newmap) |
|
|
259 | *newmap = mp; |
|
|
260 | if (nx) |
|
|
261 | *nx = newx; |
|
|
262 | if (ny) |
|
|
263 | *ny = newy; |
|
|
264 | |
258 | |
265 | retval |= mp->spaces[newx + mp->width * newy].flags; |
259 | if (newmap) *newmap = mp; |
|
|
260 | if (nx) *nx = newx; |
|
|
261 | if (ny) *ny = newy; |
266 | |
262 | |
267 | return retval; |
263 | return retval | mp->at (newx, newy).flags (); |
268 | } |
264 | } |
269 | |
265 | |
270 | /* |
266 | /* |
271 | * Returns true if the given coordinate is blocked except by the |
267 | * Returns true if the given coordinate is blocked except by the |
272 | * object passed is not blocking. This is used with |
268 | * object passed is not blocking. This is used with |
… | |
… | |
295 | } |
291 | } |
296 | |
292 | |
297 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
293 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
298 | * directly. |
294 | * directly. |
299 | */ |
295 | */ |
300 | mflags = m->spaces[sx + m->width * sy].flags; |
296 | mflags = m->at (sx, sy).flags (); |
301 | |
297 | |
302 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
298 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
303 | |
299 | |
304 | /* If space is currently not blocked by anything, no need to |
300 | /* If space is currently not blocked by anything, no need to |
305 | * go further. Not true for players - all sorts of special |
301 | * go further. Not true for players - all sorts of special |
… | |
… | |
324 | /* We basically go through the stack of objects, and if there is |
320 | /* We basically go through the stack of objects, and if there is |
325 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
321 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
326 | * true. If we get through the entire stack, that must mean |
322 | * true. If we get through the entire stack, that must mean |
327 | * ob is blocking it, so return 0. |
323 | * ob is blocking it, so return 0. |
328 | */ |
324 | */ |
329 | for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) |
325 | for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) |
330 | { |
326 | { |
331 | |
327 | |
332 | /* This must be before the checks below. Code for inventory checkers. */ |
328 | /* This must be before the checks below. Code for inventory checkers. */ |
333 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
329 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
334 | { |
330 | { |
… | |
… | |
398 | * |
394 | * |
399 | * Note this used to be arch_blocked, but with new movement |
395 | * Note this used to be arch_blocked, but with new movement |
400 | * code, we need to have actual object to check its move_type |
396 | * code, we need to have actual object to check its move_type |
401 | * against the move_block values. |
397 | * against the move_block values. |
402 | */ |
398 | */ |
403 | |
|
|
404 | int |
399 | int |
405 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
400 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
406 | { |
401 | { |
407 | archetype *tmp; |
402 | archetype *tmp; |
408 | int flag; |
403 | int flag; |
… | |
… | |
414 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
409 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
415 | if (flag & P_OUT_OF_MAP) |
410 | if (flag & P_OUT_OF_MAP) |
416 | return P_OUT_OF_MAP; |
411 | return P_OUT_OF_MAP; |
417 | |
412 | |
418 | /* don't have object, so don't know what types would block */ |
413 | /* don't have object, so don't know what types would block */ |
419 | return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); |
414 | return m1->at (sx, sy).move_block; |
420 | } |
415 | } |
421 | |
416 | |
422 | for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) |
417 | for (tmp = ob->arch; tmp; tmp = tmp->more) |
423 | { |
418 | { |
424 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
419 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
425 | |
420 | |
426 | if (flag & P_OUT_OF_MAP) |
421 | if (flag & P_OUT_OF_MAP) |
427 | return P_OUT_OF_MAP; |
422 | return P_OUT_OF_MAP; |
428 | if (flag & P_IS_ALIVE) |
423 | if (flag & P_IS_ALIVE) |
429 | return P_IS_ALIVE; |
424 | return P_IS_ALIVE; |
430 | |
425 | |
|
|
426 | mapspace &ms = m1->at (sx, sy); |
|
|
427 | |
|
|
428 | |
431 | /* find_first_free_spot() calls this function. However, often |
429 | /* find_first_free_spot() calls this function. However, often |
432 | * ob doesn't have any move type (when used to place exits) |
430 | * ob doesn't have any move type (when used to place exits) |
433 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
431 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
434 | */ |
432 | */ |
435 | |
433 | |
436 | if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) |
434 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
437 | continue; |
435 | continue; |
438 | |
436 | |
439 | /* Note it is intentional that we check ob - the movement type of the |
437 | /* Note it is intentional that we check ob - the movement type of the |
440 | * head of the object should correspond for the entire object. |
438 | * head of the object should correspond for the entire object. |
441 | */ |
439 | */ |
442 | if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) |
440 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
443 | return AB_NO_PASS; |
441 | return P_NO_PASS; |
444 | |
|
|
445 | } |
442 | } |
|
|
443 | |
446 | return 0; |
444 | return 0; |
447 | } |
445 | } |
448 | |
446 | |
449 | /* When the map is loaded, load_object does not actually insert objects |
447 | /* When the map is loaded, load_object does not actually insert objects |
450 | * into inventory, but just links them. What this does is go through |
448 | * into inventory, but just links them. What this does is go through |
… | |
… | |
487 | object *tmp, *op, *last, *above; |
485 | object *tmp, *op, *last, *above; |
488 | archetype *at; |
486 | archetype *at; |
489 | |
487 | |
490 | for (x = 0; x < MAP_WIDTH (m); x++) |
488 | for (x = 0; x < MAP_WIDTH (m); x++) |
491 | for (y = 0; y < MAP_HEIGHT (m); y++) |
489 | for (y = 0; y < MAP_HEIGHT (m); y++) |
492 | for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) |
490 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) |
493 | { |
491 | { |
494 | above = tmp->above; |
492 | above = tmp->above; |
495 | |
493 | |
496 | /* already multipart - don't do anything more */ |
494 | /* already multipart - don't do anything more */ |
497 | if (tmp->head || tmp->more) |
495 | if (tmp->head || tmp->more) |
… | |
… | |
547 | { |
545 | { |
548 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
546 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
549 | continue; |
547 | continue; |
550 | } |
548 | } |
551 | |
549 | |
552 | |
|
|
553 | switch (i) |
550 | switch (i) |
554 | { |
551 | { |
555 | case LL_NORMAL: |
552 | case LL_NORMAL: |
556 | /* if we are loading an overlay, put the floors on the bottom */ |
553 | /* if we are loading an overlay, put the floors on the bottom */ |
557 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
554 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
… | |
… | |
582 | { |
579 | { |
583 | for (j = 0; j < m->height; j++) |
580 | for (j = 0; j < m->height; j++) |
584 | { |
581 | { |
585 | unique = 0; |
582 | unique = 0; |
586 | /* check for unique items, or unique squares */ |
583 | /* check for unique items, or unique squares */ |
587 | for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) |
584 | for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) |
588 | { |
585 | { |
589 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
586 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
590 | unique = 1; |
587 | unique = 1; |
591 | |
588 | |
592 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
589 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
… | |
… | |
613 | /* first pass - save one-part objects */ |
610 | /* first pass - save one-part objects */ |
614 | for (i = 0; i < MAP_WIDTH (m); i++) |
611 | for (i = 0; i < MAP_WIDTH (m); i++) |
615 | for (j = 0; j < MAP_HEIGHT (m); j++) |
612 | for (j = 0; j < MAP_HEIGHT (m); j++) |
616 | { |
613 | { |
617 | unique = 0; |
614 | unique = 0; |
618 | 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) |
619 | { |
616 | { |
620 | 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)) |
621 | unique = 1; |
618 | unique = 1; |
622 | |
619 | |
623 | if (op->type == PLAYER) |
620 | if (op->type == PLAYER) |
624 | { |
|
|
625 | LOG (llevDebug, "Player on map that is being saved\n"); |
|
|
626 | continue; |
621 | continue; |
627 | } |
|
|
628 | |
622 | |
629 | if (op->head || op->owner) |
623 | if (op->head || op->owner) |
630 | continue; |
624 | continue; |
631 | |
625 | |
632 | if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) |
626 | if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) |
633 | save_object (fp2, op, 3); |
627 | save_object (fp2, op, 3); |
634 | 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)))) |
635 | save_object (fp, op, 3); |
629 | save_object (fp, op, 3); |
636 | |
630 | } |
637 | } /* for this space */ |
631 | } |
638 | } /* for this j */ |
|
|
639 | } |
632 | } |
640 | |
633 | |
641 | maptile::maptile () |
634 | maptile::maptile () |
642 | { |
635 | { |
643 | in_memory = MAP_SWAPPED; |
636 | in_memory = MAP_SWAPPED; |
… | |
… | |
693 | { |
686 | { |
694 | 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); |
695 | free (spaces); |
688 | free (spaces); |
696 | } |
689 | } |
697 | |
690 | |
698 | spaces = (MapSpace *) |
691 | spaces = (mapspace *) |
699 | calloc (1, width * height * sizeof (MapSpace)); |
692 | calloc (1, width * height * sizeof (mapspace)); |
700 | |
693 | |
701 | if (!spaces) |
694 | if (!spaces) |
702 | fatal (OUT_OF_MEMORY); |
695 | fatal (OUT_OF_MEMORY); |
703 | } |
696 | } |
704 | |
697 | |
… | |
… | |
730 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
723 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
731 | shopitems *items = NULL; |
724 | shopitems *items = NULL; |
732 | int i = 0, number_of_entries = 0; |
725 | int i = 0, number_of_entries = 0; |
733 | const typedata *current_type; |
726 | const typedata *current_type; |
734 | |
727 | |
735 | shop_string = strdup_local (input_string); |
728 | shop_string = strdup (input_string); |
736 | p = shop_string; |
729 | p = shop_string; |
737 | /* 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 */ |
738 | while (p) |
731 | while (p) |
739 | { |
732 | { |
740 | p = strchr (p, ';'); |
733 | p = strchr (p, ';'); |
… | |
… | |
926 | * with nothing between). There is no reason in those cases to |
919 | * with nothing between). There is no reason in those cases to |
927 | * keep the empty message. Also, msgbuf contains garbage data |
920 | * keep the empty message. Also, msgbuf contains garbage data |
928 | * when msgpos is zero, so copying it results in crashes |
921 | * when msgpos is zero, so copying it results in crashes |
929 | */ |
922 | */ |
930 | if (msgpos != 0) |
923 | if (msgpos != 0) |
931 | m->msg = strdup_local (msgbuf); |
924 | m->msg = strdup (msgbuf); |
932 | } |
925 | } |
933 | else if (!strcmp (key, "maplore")) |
926 | else if (!strcmp (key, "maplore")) |
934 | { |
927 | { |
935 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
928 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
936 | { |
929 | { |
… | |
… | |
942 | strcpy (maplorebuf + maplorepos, buf); |
935 | strcpy (maplorebuf + maplorepos, buf); |
943 | maplorepos += strlen (buf); |
936 | maplorepos += strlen (buf); |
944 | } |
937 | } |
945 | } |
938 | } |
946 | if (maplorepos != 0) |
939 | if (maplorepos != 0) |
947 | m->maplore = strdup_local (maplorebuf); |
940 | m->maplore = strdup (maplorebuf); |
948 | } |
941 | } |
949 | else if (!strcmp (key, "end")) |
942 | else if (!strcmp (key, "end")) |
950 | { |
943 | { |
951 | break; |
944 | break; |
952 | } |
945 | } |
… | |
… | |
961 | 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); |
962 | } |
955 | } |
963 | else if (!strcmp (key, "name")) |
956 | else if (!strcmp (key, "name")) |
964 | { |
957 | { |
965 | *end = 0; |
958 | *end = 0; |
966 | m->name = strdup_local (value); |
959 | m->name = strdup (value); |
967 | } |
960 | } |
968 | /* first strcmp value on these are old names supported |
961 | /* first strcmp value on these are old names supported |
969 | * for compatibility reasons. The new values (second) are |
962 | * for compatibility reasons. The new values (second) are |
970 | * what really should be used. |
963 | * what really should be used. |
971 | */ |
964 | */ |
… | |
… | |
1009 | else if (!strcmp (key, "shopmax")) |
1002 | else if (!strcmp (key, "shopmax")) |
1010 | m->shopmax = atol (value); |
1003 | m->shopmax = atol (value); |
1011 | else if (!strcmp (key, "shoprace")) |
1004 | else if (!strcmp (key, "shoprace")) |
1012 | { |
1005 | { |
1013 | *end = 0; |
1006 | *end = 0; |
1014 | m->shoprace = strdup_local (value); |
1007 | m->shoprace = strdup (value); |
1015 | } |
1008 | } |
1016 | else if (!strcmp (key, "outdoor")) |
1009 | else if (!strcmp (key, "outdoor")) |
1017 | m->outdoor = atoi (value); |
1010 | m->outdoor = atoi (value); |
1018 | else if (!strcmp (key, "temp")) |
1011 | else if (!strcmp (key, "temp")) |
1019 | m->temp = atoi (value); |
1012 | m->temp = atoi (value); |
… | |
… | |
1069 | } |
1062 | } |
1070 | |
1063 | |
1071 | if (editor) |
1064 | if (editor) |
1072 | { |
1065 | { |
1073 | /* Use the value as in the file. */ |
1066 | /* Use the value as in the file. */ |
1074 | m->tile_path[tile - 1] = strdup_local (value); |
1067 | m->tile_path[tile - 1] = strdup (value); |
1075 | } |
1068 | } |
1076 | else if (path != NULL) |
1069 | else if (path != NULL) |
1077 | { |
1070 | { |
1078 | /* Use the normalized value. */ |
1071 | /* Use the normalized value. */ |
1079 | m->tile_path[tile - 1] = strdup_local (path); |
1072 | m->tile_path[tile - 1] = strdup (path); |
1080 | } |
1073 | } |
1081 | } /* end if tile direction (in)valid */ |
1074 | } /* end if tile direction (in)valid */ |
1082 | } |
1075 | } |
1083 | else |
1076 | else |
1084 | 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); |
… | |
… | |
1130 | strcpy (m->path, filename); |
1123 | strcpy (m->path, filename); |
1131 | if (load_map_header (thawer, m)) |
1124 | if (load_map_header (thawer, m)) |
1132 | { |
1125 | { |
1133 | 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); |
1134 | delete_map (m); |
1127 | delete_map (m); |
1135 | return NULL; |
1128 | return 0; |
1136 | } |
1129 | } |
1137 | |
1130 | |
1138 | m->allocate (); |
1131 | m->allocate (); |
1139 | |
1132 | |
1140 | m->in_memory = MAP_LOADING; |
1133 | m->in_memory = MAP_LOADING; |
… | |
… | |
1223 | if (load_map_header (thawer, m)) |
1216 | if (load_map_header (thawer, m)) |
1224 | { |
1217 | { |
1225 | 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); |
1226 | delete_map (m); |
1219 | delete_map (m); |
1227 | m = load_original_map (m->path, 0); |
1220 | m = load_original_map (m->path, 0); |
1228 | return NULL; |
1221 | return 0; |
1229 | } |
1222 | } |
1230 | /*m->allocate ();*/ |
1223 | /*m->allocate ();*/ |
1231 | |
1224 | |
1232 | m->in_memory = MAP_LOADING; |
1225 | m->in_memory = MAP_LOADING; |
1233 | load_objects (m, thawer, MAP_OVERLAY); |
1226 | load_objects (m, thawer, MAP_OVERLAY); |
… | |
… | |
1250 | for (i = 0; i < MAP_WIDTH (m); i++) |
1243 | for (i = 0; i < MAP_WIDTH (m); i++) |
1251 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1244 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1252 | { |
1245 | { |
1253 | unique = 0; |
1246 | unique = 0; |
1254 | |
1247 | |
1255 | for (op = get_map_ob (m, i, j); op; op = next) |
1248 | for (op = GET_MAP_OB (m, i, j); op; op = next) |
1256 | { |
1249 | { |
1257 | next = op->above; |
1250 | next = op->above; |
1258 | |
1251 | |
1259 | 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)) |
1260 | unique = 1; |
1253 | unique = 1; |
1261 | |
1254 | |
1262 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1255 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1263 | { |
1256 | { |
1264 | clean_object (op); |
1257 | op->destroy_inv (false); |
1265 | |
|
|
1266 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
|
|
1267 | remove_button_link (op); |
|
|
1268 | |
|
|
1269 | op->destroy (); |
1258 | op->destroy (); |
1270 | } |
1259 | } |
1271 | } |
1260 | } |
1272 | } |
1261 | } |
1273 | } |
1262 | } |
… | |
… | |
1343 | make_path_to_file (filename); |
1332 | make_path_to_file (filename); |
1344 | } |
1333 | } |
1345 | else |
1334 | else |
1346 | { |
1335 | { |
1347 | if (!m->tmpname) |
1336 | if (!m->tmpname) |
1348 | m->tmpname = tempnam_local (settings.tmpdir, NULL); |
1337 | m->tmpname = tempnam (settings.tmpdir, NULL); |
1349 | |
1338 | |
1350 | strcpy (filename, m->tmpname); |
1339 | strcpy (filename, m->tmpname); |
1351 | } |
1340 | } |
1352 | |
1341 | |
1353 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
1342 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
… | |
… | |
1455 | freezer.save (filename); |
1444 | freezer.save (filename); |
1456 | |
1445 | |
1457 | return 0; |
1446 | return 0; |
1458 | } |
1447 | } |
1459 | |
1448 | |
1460 | |
|
|
1461 | /* |
|
|
1462 | * Remove and free all objects in the inventory of the given object. |
|
|
1463 | * object.c ? |
|
|
1464 | */ |
|
|
1465 | |
|
|
1466 | void |
|
|
1467 | clean_object (object *op) |
|
|
1468 | { |
|
|
1469 | object *tmp, *next; |
|
|
1470 | |
|
|
1471 | for (tmp = op->inv; tmp; tmp = next) |
|
|
1472 | { |
|
|
1473 | next = tmp->below; |
|
|
1474 | |
|
|
1475 | clean_object (tmp); |
|
|
1476 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
|
|
1477 | remove_button_link (tmp); |
|
|
1478 | |
|
|
1479 | tmp->destroy (); |
|
|
1480 | } |
|
|
1481 | } |
|
|
1482 | |
|
|
1483 | /* |
1449 | /* |
1484 | * Remove and free all objects in the given map. |
1450 | * Remove and free all objects in the given map. |
1485 | */ |
1451 | */ |
1486 | |
|
|
1487 | void |
1452 | void |
1488 | free_all_objects (maptile *m) |
1453 | free_all_objects (maptile *m) |
1489 | { |
1454 | { |
1490 | int i, j; |
1455 | if (!m->spaces) |
1491 | object *op; |
1456 | return; |
1492 | |
1457 | |
1493 | for (i = 0; i < MAP_WIDTH (m); i++) |
1458 | for (int i = 0; i < MAP_WIDTH (m); i++) |
1494 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1459 | for (int j = 0; j < MAP_HEIGHT (m); j++) |
1495 | { |
1460 | { |
1496 | object *previous_obj = NULL; |
1461 | mapspace &ms = m->at (i, j); |
1497 | |
1462 | |
1498 | while ((op = GET_MAP_OB (m, i, j)) != NULL) |
1463 | while (object *op = ms.bottom) |
1499 | { |
1464 | { |
1500 | if (op == previous_obj) |
|
|
1501 | { |
|
|
1502 | LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); |
|
|
1503 | break; |
|
|
1504 | } |
|
|
1505 | |
|
|
1506 | previous_obj = op; |
|
|
1507 | |
|
|
1508 | if (op->head != NULL) |
1465 | if (op->head) |
1509 | op = op->head; |
1466 | op = op->head; |
1510 | |
1467 | |
1511 | /* If the map isn't in memory, free_object will remove and |
1468 | op->destroy_inv (false); |
1512 | * free objects in op's inventory. So let it do the job. |
|
|
1513 | */ |
|
|
1514 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1515 | clean_object (op); |
|
|
1516 | |
|
|
1517 | op->destroy (); |
1469 | op->destroy (); |
1518 | } |
1470 | } |
1519 | } |
1471 | } |
1520 | } |
1472 | } |
1521 | |
1473 | |
1522 | /* |
1474 | /* |
1523 | * Frees everything allocated by the given maptileure. |
1475 | * Frees everything allocated by the given maptileure. |
1524 | * don't free tmpname - our caller is left to do that |
1476 | * don't free tmpname - our caller is left to do that |
1525 | */ |
1477 | */ |
1526 | |
|
|
1527 | void |
1478 | void |
1528 | free_map (maptile *m, int flag) |
1479 | free_map (maptile *m, int flag) |
1529 | { |
1480 | { |
1530 | int i; |
1481 | if (m->in_memory != MAP_IN_MEMORY) |
1531 | |
|
|
1532 | if (!m->in_memory) |
|
|
1533 | { |
|
|
1534 | LOG (llevError, "Trying to free freed map.\n"); |
|
|
1535 | return; |
1482 | return; |
1536 | } |
1483 | |
|
|
1484 | m->in_memory = MAP_SAVING; |
|
|
1485 | |
|
|
1486 | // TODO: use new/delete |
|
|
1487 | #define FREE_AND_CLEAR(p) { free (p); p = NULL; } |
|
|
1488 | |
1537 | if (flag && m->spaces) |
1489 | if (flag && m->spaces) |
1538 | free_all_objects (m); |
1490 | free_all_objects (m); |
1539 | if (m->name) |
1491 | if (m->name) |
1540 | FREE_AND_CLEAR (m->name); |
1492 | FREE_AND_CLEAR (m->name); |
1541 | if (m->spaces) |
1493 | if (m->spaces) |
1542 | FREE_AND_CLEAR (m->spaces); |
1494 | FREE_AND_CLEAR (m->spaces); |
1543 | if (m->msg) |
1495 | if (m->msg) |
1544 | FREE_AND_CLEAR (m->msg); |
1496 | FREE_AND_CLEAR (m->msg); |
1545 | if (m->maplore) |
1497 | if (m->maplore) |
1546 | FREE_AND_CLEAR (m->maplore); |
1498 | FREE_AND_CLEAR (m->maplore); |
1547 | if (m->shopitems) |
1499 | |
1548 | delete[]m->shopitems; |
1500 | delete [] m->shopitems; |
1549 | m->shopitems = 0; |
1501 | m->shopitems = 0; |
|
|
1502 | |
1550 | if (m->shoprace) |
1503 | if (m->shoprace) |
1551 | FREE_AND_CLEAR (m->shoprace); |
1504 | FREE_AND_CLEAR (m->shoprace); |
|
|
1505 | |
1552 | if (m->buttons) |
1506 | if (m->buttons) |
1553 | free_objectlinkpt (m->buttons); |
1507 | free_objectlinkpt (m->buttons); |
|
|
1508 | |
1554 | m->buttons = NULL; |
1509 | m->buttons = NULL; |
|
|
1510 | |
1555 | for (i = 0; i < 4; i++) |
1511 | for (int i = 0; i < 4; i++) |
1556 | { |
1512 | { |
1557 | if (m->tile_path[i]) |
1513 | if (m->tile_path[i]) |
1558 | FREE_AND_CLEAR (m->tile_path[i]); |
1514 | FREE_AND_CLEAR (m->tile_path[i]); |
|
|
1515 | |
1559 | m->tile_map[i] = NULL; |
1516 | m->tile_map[i] = 0; |
1560 | } |
1517 | } |
|
|
1518 | |
1561 | m->in_memory = MAP_SWAPPED; |
1519 | m->in_memory = MAP_SWAPPED; |
1562 | } |
|
|
1563 | |
1520 | |
1564 | /* |
1521 | #undef FREE_AND_CLEAR |
1565 | * function: vanish maptile |
1522 | } |
1566 | * m : pointer to maptile, if NULL no action |
1523 | |
1567 | * this deletes all the data on the map (freeing pointers) |
1524 | maptile::~maptile () |
1568 | * and then removes this map from the global linked list of maps. |
1525 | { |
|
|
1526 | free_map (this, 1); |
|
|
1527 | free (tmpname); |
|
|
1528 | } |
|
|
1529 | |
|
|
1530 | void |
|
|
1531 | maptile::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. |
1569 | */ |
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; |
1570 | |
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 |
1571 | void |
1560 | void |
1572 | delete_map (maptile *m) |
1561 | delete_map (maptile *m) |
1573 | { |
1562 | { |
1574 | maptile *tmp, *last; |
|
|
1575 | int i; |
|
|
1576 | |
|
|
1577 | if (!m) |
1563 | if (m) |
1578 | return; |
1564 | m->destroy (); |
1579 | |
|
|
1580 | m->clear (); |
|
|
1581 | |
|
|
1582 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1583 | { |
|
|
1584 | /* change to MAP_SAVING, even though we are not, |
|
|
1585 | * so that remove_ob doesn't do as much work. |
|
|
1586 | */ |
|
|
1587 | m->in_memory = MAP_SAVING; |
|
|
1588 | free_map (m, 1); |
|
|
1589 | } |
|
|
1590 | /* move this out of free_map, since tmpname can still be needed if |
|
|
1591 | * the map is swapped out. |
|
|
1592 | */ |
|
|
1593 | if (m->tmpname) |
|
|
1594 | { |
|
|
1595 | free (m->tmpname); |
|
|
1596 | m->tmpname = NULL; |
|
|
1597 | } |
|
|
1598 | last = NULL; |
|
|
1599 | /* We need to look through all the maps and see if any maps |
|
|
1600 | * are pointing at this one for tiling information. Since |
|
|
1601 | * tiling can be assymetric, we just can not look to see which |
|
|
1602 | * maps this map tiles with and clears those. |
|
|
1603 | */ |
|
|
1604 | for (tmp = first_map; tmp != NULL; tmp = tmp->next) |
|
|
1605 | { |
|
|
1606 | if (tmp->next == m) |
|
|
1607 | last = tmp; |
|
|
1608 | |
|
|
1609 | /* This should hopefully get unrolled on a decent compiler */ |
|
|
1610 | for (i = 0; i < 4; i++) |
|
|
1611 | if (tmp->tile_map[i] == m) |
|
|
1612 | tmp->tile_map[i] = NULL; |
|
|
1613 | } |
|
|
1614 | |
|
|
1615 | /* If last is null, then this should be the first map in the list */ |
|
|
1616 | if (!last) |
|
|
1617 | { |
|
|
1618 | if (m == first_map) |
|
|
1619 | first_map = m->next; |
|
|
1620 | else |
|
|
1621 | /* m->path is a static char, so should hopefully still have |
|
|
1622 | * some useful data in it. |
|
|
1623 | */ |
|
|
1624 | LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path); |
|
|
1625 | } |
|
|
1626 | else |
|
|
1627 | last->next = m->next; |
|
|
1628 | |
|
|
1629 | delete m; |
|
|
1630 | } |
1565 | } |
1631 | |
|
|
1632 | |
|
|
1633 | |
1566 | |
1634 | /* |
1567 | /* |
1635 | * Makes sure the given map is loaded and swapped in. |
1568 | * Makes sure the given map is loaded and swapped in. |
1636 | * name is path name of the map. |
1569 | * name is path name of the map. |
1637 | * flags meaning: |
1570 | * flags meaning: |
… | |
… | |
1640 | * 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. |
1641 | * dont do any more name translation on it. |
1574 | * dont do any more name translation on it. |
1642 | * |
1575 | * |
1643 | * Returns a pointer to the given map. |
1576 | * Returns a pointer to the given map. |
1644 | */ |
1577 | */ |
1645 | |
|
|
1646 | maptile * |
1578 | maptile * |
1647 | ready_map_name (const char *name, int flags) |
1579 | ready_map_name (const char *name, int flags) |
1648 | { |
1580 | { |
1649 | maptile *m; |
|
|
1650 | |
|
|
1651 | if (!name) |
1581 | if (!name) |
1652 | return (NULL); |
1582 | return 0; |
1653 | |
1583 | |
1654 | /* Have we been at this level before? */ |
1584 | /* Have we been at this level before? */ |
1655 | m = has_been_loaded (name); |
1585 | maptile *m = has_been_loaded (name); |
1656 | |
1586 | |
1657 | /* Map is good to go, so just return it */ |
1587 | /* Map is good to go, so just return it */ |
1658 | 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)) |
1659 | { |
|
|
1660 | return m; |
1589 | return m; |
1661 | } |
|
|
1662 | |
1590 | |
1663 | /* unique maps always get loaded from their original location, and never |
1591 | /* unique maps always get loaded from their original location, and never |
1664 | * 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 |
1665 | * 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 - |
1666 | * 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 |
… | |
… | |
1668 | * 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 |
1669 | * 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. |
1670 | */ |
1598 | */ |
1671 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1599 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1672 | { |
1600 | { |
1673 | |
|
|
1674 | /* first visit or time to reset */ |
1601 | /* first visit or time to reset */ |
1675 | if (m) |
1602 | if (m) |
1676 | { |
1603 | { |
1677 | clean_tmp_map (m); /* Doesn't make much difference */ |
1604 | clean_tmp_map (m); /* Doesn't make much difference */ |
1678 | delete_map (m); |
1605 | delete_map (m); |
… | |
… | |
1773 | return MAP_DIFFICULTY (m); |
1700 | return MAP_DIFFICULTY (m); |
1774 | } |
1701 | } |
1775 | |
1702 | |
1776 | for (x = 0; x < MAP_WIDTH (m); x++) |
1703 | for (x = 0; x < MAP_WIDTH (m); x++) |
1777 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1704 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1778 | 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) |
1779 | { |
1706 | { |
1780 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1707 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1781 | { |
1708 | { |
1782 | total_exp += op->stats.exp; |
1709 | total_exp += op->stats.exp; |
1783 | monster_cnt++; |
1710 | monster_cnt++; |
… | |
… | |
1876 | /* All clients need to get re-updated for the change */ |
1803 | /* All clients need to get re-updated for the change */ |
1877 | update_all_map_los (m); |
1804 | update_all_map_los (m); |
1878 | return 1; |
1805 | return 1; |
1879 | } |
1806 | } |
1880 | |
1807 | |
1881 | |
|
|
1882 | /* |
1808 | /* |
1883 | * This function updates various attributes about a specific space |
1809 | * This function updates various attributes about a specific space |
1884 | * on the map (what it looks like, whether it blocks magic, |
1810 | * on the map (what it looks like, whether it blocks magic, |
1885 | * has a living creatures, prevents people from passing |
1811 | * has a living creatures, prevents people from passing |
1886 | * through, etc) |
1812 | * through, etc) |
1887 | */ |
1813 | */ |
1888 | void |
1814 | void |
1889 | update_position (maptile *m, int x, int y) |
1815 | mapspace::update_ () |
1890 | { |
1816 | { |
1891 | object *tmp, *last = NULL; |
1817 | object *tmp, *last = 0; |
1892 | uint8 flags = 0, oldflags, light = 0, anywhere = 0; |
1818 | uint8 flags = 0, light = 0, anywhere = 0; |
1893 | New_Face *top, *floor, *middle; |
1819 | New_Face *top, *floor, *middle; |
1894 | object *top_obj, *floor_obj, *middle_obj; |
1820 | object *top_obj, *floor_obj, *middle_obj; |
1895 | 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; |
1896 | |
1822 | |
1897 | oldflags = GET_MAP_FLAGS (m, x, y); |
|
|
1898 | if (!(oldflags & P_NEED_UPDATE)) |
|
|
1899 | { |
|
|
1900 | LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y); |
|
|
1901 | return; |
|
|
1902 | } |
|
|
1903 | |
|
|
1904 | middle = blank_face; |
1823 | middle = blank_face; |
1905 | top = blank_face; |
1824 | top = blank_face; |
1906 | floor = blank_face; |
1825 | floor = blank_face; |
1907 | |
1826 | |
1908 | middle_obj = NULL; |
1827 | middle_obj = 0; |
1909 | top_obj = NULL; |
1828 | top_obj = 0; |
1910 | floor_obj = NULL; |
1829 | floor_obj = 0; |
1911 | |
1830 | |
1912 | for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) |
1831 | for (tmp = bottom; tmp; last = tmp, tmp = tmp->above) |
1913 | { |
1832 | { |
1914 | |
|
|
1915 | /* This could be made additive I guess (two lights better than |
1833 | /* This could be made additive I guess (two lights better than |
1916 | * 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 |
1917 | * light bulbs do not illuminate twice as far as once since |
1835 | * light bulbs do not illuminate twice as far as once since |
1918 | * it is a disapation factor that is squared (or is it cubed?) |
1836 | * it is a dissapation factor that is cubed. |
1919 | */ |
1837 | */ |
1920 | if (tmp->glow_radius > light) |
1838 | if (tmp->glow_radius > light) |
1921 | light = tmp->glow_radius; |
1839 | light = tmp->glow_radius; |
1922 | |
1840 | |
1923 | /* This call is needed in order to update objects the player |
1841 | /* This call is needed in order to update objects the player |
… | |
… | |
1961 | { |
1879 | { |
1962 | middle = tmp->face; |
1880 | middle = tmp->face; |
1963 | middle_obj = tmp; |
1881 | middle_obj = tmp; |
1964 | } |
1882 | } |
1965 | } |
1883 | } |
|
|
1884 | |
1966 | if (tmp == tmp->above) |
1885 | if (tmp == tmp->above) |
1967 | { |
1886 | { |
1968 | LOG (llevError, "Error in structure of map\n"); |
1887 | LOG (llevError, "Error in structure of map\n"); |
1969 | exit (-1); |
1888 | exit (-1); |
1970 | } |
1889 | } |
1971 | |
1890 | |
1972 | move_slow |= tmp->move_slow; |
1891 | move_slow |= tmp->move_slow; |
1973 | move_block |= tmp->move_block; |
1892 | move_block |= tmp->move_block; |
1974 | move_on |= tmp->move_on; |
1893 | move_on |= tmp->move_on; |
1975 | move_off |= tmp->move_off; |
1894 | move_off |= tmp->move_off; |
1976 | move_allow |= tmp->move_allow; |
1895 | move_allow |= tmp->move_allow; |
1977 | |
1896 | |
1978 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
|
|
1979 | flags |= P_IS_ALIVE; |
|
|
1980 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) |
|
|
1981 | flags |= P_NO_MAGIC; |
|
|
1982 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) |
|
|
1983 | flags |= P_NO_CLERIC; |
|
|
1984 | if (tmp->type == SAFE_GROUND) |
|
|
1985 | flags |= P_SAFE; |
|
|
1986 | |
|
|
1987 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) |
1897 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; |
1988 | flags |= P_BLOCKSVIEW; |
1898 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; |
1989 | } /* for stack of objects */ |
1899 | if (tmp->type == PLAYER) flags |= P_PLAYER; |
1990 | |
1900 | if (tmp->type == SAFE_GROUND) flags |= P_SAFE; |
1991 | /* 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; |
1992 | * since we're already doing the work, we calculate them here. |
1902 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; |
1993 | * if they don't match, logic is broken someplace. |
|
|
1994 | */ |
|
|
1995 | if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR))) |
|
|
1996 | { |
1903 | } |
1997 | LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", |
1904 | |
1998 | m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); |
1905 | this->light = light; |
1999 | } |
1906 | this->flags_ = flags; |
2000 | SET_MAP_FLAGS (m, x, y, flags); |
1907 | this->move_block = move_block & ~move_allow; |
2001 | SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); |
1908 | this->move_on = move_on; |
2002 | SET_MAP_MOVE_ON (m, x, y, move_on); |
1909 | this->move_off = move_off; |
2003 | SET_MAP_MOVE_OFF (m, x, y, move_off); |
1910 | this->move_slow = move_slow; |
2004 | SET_MAP_MOVE_SLOW (m, x, y, move_slow); |
|
|
2005 | |
1911 | |
2006 | /* 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), |
2007 | * 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 |
2008 | * this point. |
1914 | * this point. |
2009 | * middle contains the highest visibility face. |
1915 | * middle contains the highest visibility face. |
… | |
… | |
2063 | break; |
1969 | break; |
2064 | } |
1970 | } |
2065 | } |
1971 | } |
2066 | } |
1972 | } |
2067 | } |
1973 | } |
|
|
1974 | |
2068 | if (middle == floor) |
1975 | if (middle == floor) |
2069 | middle = blank_face; |
1976 | middle = blank_face; |
|
|
1977 | |
2070 | if (top == middle) |
1978 | if (top == middle) |
2071 | middle = blank_face; |
1979 | middle = blank_face; |
2072 | SET_MAP_FACE (m, x, y, top, 0); |
|
|
2073 | if (top != blank_face) |
|
|
2074 | SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); |
|
|
2075 | else |
|
|
2076 | SET_MAP_FACE_OBJ (m, x, y, NULL, 0); |
|
|
2077 | SET_MAP_FACE (m, x, y, middle, 1); |
|
|
2078 | if (middle != blank_face) |
|
|
2079 | SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1); |
|
|
2080 | else |
|
|
2081 | SET_MAP_FACE_OBJ (m, x, y, NULL, 1); |
|
|
2082 | SET_MAP_FACE (m, x, y, floor, 2); |
|
|
2083 | if (floor != blank_face) |
|
|
2084 | SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2); |
|
|
2085 | else |
|
|
2086 | SET_MAP_FACE_OBJ (m, x, y, NULL, 2); |
|
|
2087 | SET_MAP_LIGHT (m, x, y, light); |
|
|
2088 | } |
|
|
2089 | |
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 | } |
2090 | |
1985 | |
2091 | void |
1986 | void |
2092 | set_map_reset_time (maptile *map) |
1987 | set_map_reset_time (maptile *map) |
2093 | { |
1988 | { |
2094 | int timeout; |
1989 | int timeout; |
… | |
… | |
2096 | timeout = MAP_RESET_TIMEOUT (map); |
1991 | timeout = MAP_RESET_TIMEOUT (map); |
2097 | if (timeout <= 0) |
1992 | if (timeout <= 0) |
2098 | timeout = MAP_DEFAULTRESET; |
1993 | timeout = MAP_DEFAULTRESET; |
2099 | if (timeout >= MAP_MAXRESET) |
1994 | if (timeout >= MAP_MAXRESET) |
2100 | timeout = MAP_MAXRESET; |
1995 | timeout = MAP_MAXRESET; |
2101 | MAP_WHEN_RESET (map) = seconds () + timeout; |
1996 | MAP_WHEN_RESET (map) = time (0) + timeout; |
2102 | } |
1997 | } |
2103 | |
1998 | |
2104 | /* 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 |
2105 | * 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 |
2106 | * 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 |
… | |
… | |
2134 | * |
2029 | * |
2135 | */ |
2030 | */ |
2136 | int |
2031 | int |
2137 | out_of_map (maptile *m, int x, int y) |
2032 | out_of_map (maptile *m, int x, int y) |
2138 | { |
2033 | { |
2139 | |
|
|
2140 | /* If we get passed a null map, this is obviously the |
2034 | /* If we get passed a null map, this is obviously the |
2141 | * case. This generally shouldn't happen, but if the |
2035 | * case. This generally shouldn't happen, but if the |
2142 | * map loads fail below, it could happen. |
2036 | * map loads fail below, it could happen. |
2143 | */ |
2037 | */ |
2144 | if (!m) |
2038 | if (!m) |
… | |
… | |
2146 | |
2040 | |
2147 | if (x < 0) |
2041 | if (x < 0) |
2148 | { |
2042 | { |
2149 | if (!m->tile_path[3]) |
2043 | if (!m->tile_path[3]) |
2150 | return 1; |
2044 | return 1; |
|
|
2045 | |
2151 | 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) |
2152 | { |
|
|
2153 | load_and_link_tiled_map (m, 3); |
2047 | load_and_link_tiled_map (m, 3); |
2154 | } |
2048 | |
2155 | 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)); |
2156 | } |
2050 | } |
|
|
2051 | |
2157 | if (x >= MAP_WIDTH (m)) |
2052 | if (x >= MAP_WIDTH (m)) |
2158 | { |
2053 | { |
2159 | if (!m->tile_path[1]) |
2054 | if (!m->tile_path[1]) |
2160 | return 1; |
2055 | return 1; |
|
|
2056 | |
2161 | 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) |
2162 | { |
|
|
2163 | load_and_link_tiled_map (m, 1); |
2058 | load_and_link_tiled_map (m, 1); |
2164 | } |
2059 | |
2165 | 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)); |
2166 | } |
2061 | } |
|
|
2062 | |
2167 | if (y < 0) |
2063 | if (y < 0) |
2168 | { |
2064 | { |
2169 | if (!m->tile_path[0]) |
2065 | if (!m->tile_path[0]) |
2170 | return 1; |
2066 | return 1; |
|
|
2067 | |
2171 | 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) |
2172 | { |
|
|
2173 | load_and_link_tiled_map (m, 0); |
2069 | load_and_link_tiled_map (m, 0); |
2174 | } |
2070 | |
2175 | 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]))); |
2176 | } |
2072 | } |
|
|
2073 | |
2177 | if (y >= MAP_HEIGHT (m)) |
2074 | if (y >= MAP_HEIGHT (m)) |
2178 | { |
2075 | { |
2179 | if (!m->tile_path[2]) |
2076 | if (!m->tile_path[2]) |
2180 | return 1; |
2077 | return 1; |
|
|
2078 | |
2181 | 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) |
2182 | { |
|
|
2183 | load_and_link_tiled_map (m, 2); |
2080 | load_and_link_tiled_map (m, 2); |
2184 | } |
2081 | |
2185 | 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))); |
2186 | } |
2083 | } |
2187 | |
2084 | |
2188 | /* Simple case - coordinates are within this local |
2085 | /* Simple case - coordinates are within this local |
2189 | * map. |
2086 | * map. |
… | |
… | |
2204 | { |
2101 | { |
2205 | |
2102 | |
2206 | if (*x < 0) |
2103 | if (*x < 0) |
2207 | { |
2104 | { |
2208 | if (!m->tile_path[3]) |
2105 | if (!m->tile_path[3]) |
2209 | return NULL; |
2106 | return 0; |
2210 | 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) |
2211 | load_and_link_tiled_map (m, 3); |
2108 | load_and_link_tiled_map (m, 3); |
2212 | |
2109 | |
2213 | *x += MAP_WIDTH (m->tile_map[3]); |
2110 | *x += MAP_WIDTH (m->tile_map[3]); |
2214 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2111 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2215 | } |
2112 | } |
|
|
2113 | |
2216 | if (*x >= MAP_WIDTH (m)) |
2114 | if (*x >= MAP_WIDTH (m)) |
2217 | { |
2115 | { |
2218 | if (!m->tile_path[1]) |
2116 | if (!m->tile_path[1]) |
2219 | return NULL; |
2117 | return 0; |
|
|
2118 | |
2220 | 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) |
2221 | load_and_link_tiled_map (m, 1); |
2120 | load_and_link_tiled_map (m, 1); |
2222 | |
2121 | |
2223 | *x -= MAP_WIDTH (m); |
2122 | *x -= MAP_WIDTH (m); |
2224 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2123 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2225 | } |
2124 | } |
|
|
2125 | |
2226 | if (*y < 0) |
2126 | if (*y < 0) |
2227 | { |
2127 | { |
2228 | if (!m->tile_path[0]) |
2128 | if (!m->tile_path[0]) |
2229 | return NULL; |
2129 | return 0; |
|
|
2130 | |
2230 | 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) |
2231 | load_and_link_tiled_map (m, 0); |
2132 | load_and_link_tiled_map (m, 0); |
2232 | |
2133 | |
2233 | *y += MAP_HEIGHT (m->tile_map[0]); |
2134 | *y += MAP_HEIGHT (m->tile_map[0]); |
2234 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2135 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2235 | } |
2136 | } |
|
|
2137 | |
2236 | if (*y >= MAP_HEIGHT (m)) |
2138 | if (*y >= MAP_HEIGHT (m)) |
2237 | { |
2139 | { |
2238 | if (!m->tile_path[2]) |
2140 | if (!m->tile_path[2]) |
2239 | return NULL; |
2141 | return 0; |
|
|
2142 | |
2240 | 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) |
2241 | load_and_link_tiled_map (m, 2); |
2144 | load_and_link_tiled_map (m, 2); |
2242 | |
2145 | |
2243 | *y -= MAP_HEIGHT (m); |
2146 | *y -= MAP_HEIGHT (m); |
2244 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2147 | return (get_map_from_coord (m->tile_map[2], x, y)); |