… | |
… | |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
20 | |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
22 | */ |
23 | |
23 | |
24 | |
|
|
25 | #include <global.h> |
24 | #include <global.h> |
26 | #include <funcpoint.h> |
25 | #include <funcpoint.h> |
27 | |
26 | |
28 | #include <loader.h> |
27 | #include <loader.h> |
29 | #include <unistd.h> |
28 | #include <unistd.h> |
30 | |
29 | |
31 | #include "path.h" |
30 | #include "path.h" |
32 | |
|
|
33 | |
31 | |
34 | /* |
32 | /* |
35 | * Returns the maptile which has a name matching the given argument. |
33 | * Returns the maptile which has a name matching the given argument. |
36 | * return NULL if no match is found. |
34 | * return NULL if no match is found. |
37 | */ |
35 | */ |
38 | |
|
|
39 | maptile * |
36 | maptile * |
40 | has_been_loaded (const char *name) |
37 | has_been_loaded (const char *name) |
41 | { |
38 | { |
42 | maptile *map; |
|
|
43 | |
|
|
44 | if (!name || !*name) |
39 | if (!name || !*name) |
45 | return 0; |
40 | return 0; |
46 | for (map = first_map; map; map = map->next) |
41 | |
|
|
42 | for_all_maps (map) |
47 | if (!strcmp (name, map->path)) |
43 | if (!strcmp (name, map->path)) |
48 | break; |
|
|
49 | return (map); |
44 | return map; |
|
|
45 | |
|
|
46 | return 0; |
50 | } |
47 | } |
51 | |
48 | |
52 | /* |
49 | /* |
53 | * This makes a path absolute outside the world of Crossfire. |
50 | * This makes a path absolute outside the world of Crossfire. |
54 | * In other words, it prepends LIBDIR/MAPDIR/ to the given path |
51 | * In other words, it prepends LIBDIR/MAPDIR/ to the given path |
… | |
… | |
197 | |
194 | |
198 | void |
195 | void |
199 | dump_map (const maptile *m) |
196 | dump_map (const maptile *m) |
200 | { |
197 | { |
201 | LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); |
198 | LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); |
202 | LOG (llevError, "Size: %dx%d Start: %d,%d\n", MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m)); |
199 | LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y); |
203 | |
200 | |
204 | if (m->msg != NULL) |
201 | if (m->msg != NULL) |
205 | LOG (llevError, "Message:\n%s", m->msg); |
202 | LOG (llevError, "Message:\n%s", m->msg); |
206 | |
203 | |
207 | if (m->maplore != NULL) |
204 | if (m->maplore != NULL) |
… | |
… | |
221 | */ |
218 | */ |
222 | |
219 | |
223 | void |
220 | void |
224 | dump_all_maps (void) |
221 | dump_all_maps (void) |
225 | { |
222 | { |
226 | maptile *m; |
223 | for_all_maps (m) |
227 | |
|
|
228 | for (m = first_map; m != NULL; m = m->next) |
|
|
229 | { |
|
|
230 | dump_map (m); |
224 | dump_map (m); |
231 | } |
|
|
232 | } |
225 | } |
233 | |
226 | |
234 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
227 | /* This rolls up wall, blocks_magic, blocks_view, etc, all into |
235 | * one function that just returns a P_.. value (see map.h) |
228 | * one function that just returns a P_.. value (see map.h) |
236 | * it will also do map translation for tiled maps, returning |
229 | * it will also do map translation for tiled maps, returning |
… | |
… | |
240 | * is needed. The case of not passing values is if we're just |
233 | * is needed. The case of not passing values is if we're just |
241 | * checking for the existence of something on those spaces, but |
234 | * checking for the existence of something on those spaces, but |
242 | * don't expect to insert/remove anything from those spaces. |
235 | * don't expect to insert/remove anything from those spaces. |
243 | */ |
236 | */ |
244 | int |
237 | int |
245 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) |
238 | get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) |
246 | { |
239 | { |
247 | sint16 newx, newy; |
240 | sint16 newx, newy; |
248 | int retval = 0; |
241 | int retval = 0; |
249 | maptile *mp; |
242 | maptile *mp; |
250 | |
243 | |
251 | if (out_of_map (oldmap, x, y)) |
|
|
252 | return P_OUT_OF_MAP; |
|
|
253 | newx = x; |
244 | newx = x; |
254 | newy = y; |
245 | newy = y; |
|
|
246 | |
255 | mp = get_map_from_coord (oldmap, &newx, &newy); |
247 | mp = get_map_from_coord (oldmap, &newx, &newy); |
|
|
248 | |
|
|
249 | if (!mp) |
|
|
250 | return P_OUT_OF_MAP; |
|
|
251 | |
256 | if (mp != oldmap) |
252 | if (mp != oldmap) |
257 | retval |= P_NEW_MAP; |
253 | retval |= P_NEW_MAP; |
258 | if (newmap) |
|
|
259 | *newmap = mp; |
|
|
260 | if (nx) |
|
|
261 | *nx = newx; |
|
|
262 | if (ny) |
|
|
263 | *ny = newy; |
|
|
264 | |
254 | |
265 | retval |= mp->spaces[newx + mp->width * newy].flags; |
255 | if (newmap) *newmap = mp; |
|
|
256 | if (nx) *nx = newx; |
|
|
257 | if (ny) *ny = newy; |
266 | |
258 | |
267 | return retval; |
259 | return retval | mp->at (newx, newy).flags (); |
268 | } |
260 | } |
269 | |
261 | |
270 | /* |
262 | /* |
271 | * Returns true if the given coordinate is blocked except by the |
263 | * Returns true if the given coordinate is blocked except by the |
272 | * object passed is not blocking. This is used with |
264 | * object passed is not blocking. This is used with |
… | |
… | |
295 | } |
287 | } |
296 | |
288 | |
297 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
289 | /* Save some cycles - instead of calling get_map_flags(), just get the value |
298 | * directly. |
290 | * directly. |
299 | */ |
291 | */ |
300 | mflags = m->spaces[sx + m->width * sy].flags; |
292 | mflags = m->at (sx, sy).flags (); |
301 | |
293 | |
302 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
294 | blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); |
303 | |
295 | |
304 | /* If space is currently not blocked by anything, no need to |
296 | /* If space is currently not blocked by anything, no need to |
305 | * go further. Not true for players - all sorts of special |
297 | * go further. Not true for players - all sorts of special |
… | |
… | |
324 | /* We basically go through the stack of objects, and if there is |
316 | /* 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 |
317 | * some other object that has NO_PASS or FLAG_ALIVE set, return |
326 | * true. If we get through the entire stack, that must mean |
318 | * true. If we get through the entire stack, that must mean |
327 | * ob is blocking it, so return 0. |
319 | * ob is blocking it, so return 0. |
328 | */ |
320 | */ |
329 | for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = tmp->above) |
321 | for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) |
330 | { |
322 | { |
331 | |
323 | |
332 | /* This must be before the checks below. Code for inventory checkers. */ |
324 | /* This must be before the checks below. Code for inventory checkers. */ |
333 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
325 | if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) |
334 | { |
326 | { |
… | |
… | |
398 | * |
390 | * |
399 | * Note this used to be arch_blocked, but with new movement |
391 | * Note this used to be arch_blocked, but with new movement |
400 | * code, we need to have actual object to check its move_type |
392 | * code, we need to have actual object to check its move_type |
401 | * against the move_block values. |
393 | * against the move_block values. |
402 | */ |
394 | */ |
403 | |
|
|
404 | int |
395 | int |
405 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
396 | ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) |
406 | { |
397 | { |
407 | archetype *tmp; |
398 | archetype *tmp; |
408 | int flag; |
399 | int flag; |
… | |
… | |
414 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
405 | flag = get_map_flags (m, &m1, x, y, &sx, &sy); |
415 | if (flag & P_OUT_OF_MAP) |
406 | if (flag & P_OUT_OF_MAP) |
416 | return P_OUT_OF_MAP; |
407 | return P_OUT_OF_MAP; |
417 | |
408 | |
418 | /* don't have object, so don't know what types would block */ |
409 | /* don't have object, so don't know what types would block */ |
419 | return (GET_MAP_MOVE_BLOCK (m1, sx, sy)); |
410 | return m1->at (sx, sy).move_block; |
420 | } |
411 | } |
421 | |
412 | |
422 | for (tmp = ob->arch; tmp != NULL; tmp = tmp->more) |
413 | for (tmp = ob->arch; tmp; tmp = tmp->more) |
423 | { |
414 | { |
424 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
415 | flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); |
425 | |
416 | |
426 | if (flag & P_OUT_OF_MAP) |
417 | if (flag & P_OUT_OF_MAP) |
427 | return P_OUT_OF_MAP; |
418 | return P_OUT_OF_MAP; |
428 | if (flag & P_IS_ALIVE) |
419 | if (flag & P_IS_ALIVE) |
429 | return P_IS_ALIVE; |
420 | return P_IS_ALIVE; |
430 | |
421 | |
|
|
422 | mapspace &ms = m1->at (sx, sy); |
|
|
423 | |
|
|
424 | |
431 | /* find_first_free_spot() calls this function. However, often |
425 | /* find_first_free_spot() calls this function. However, often |
432 | * ob doesn't have any move type (when used to place exits) |
426 | * 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. |
427 | * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. |
434 | */ |
428 | */ |
435 | |
429 | |
436 | if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK (m1, sx, sy) != MOVE_ALL) |
430 | if (ob->move_type == 0 && ms.move_block != MOVE_ALL) |
437 | continue; |
431 | continue; |
438 | |
432 | |
439 | /* Note it is intentional that we check ob - the movement type of the |
433 | /* Note it is intentional that we check ob - the movement type of the |
440 | * head of the object should correspond for the entire object. |
434 | * head of the object should correspond for the entire object. |
441 | */ |
435 | */ |
442 | if (OB_TYPE_MOVE_BLOCK (ob, GET_MAP_MOVE_BLOCK (m1, sx, sy))) |
436 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
443 | return AB_NO_PASS; |
437 | return P_NO_PASS; |
444 | |
|
|
445 | } |
438 | } |
|
|
439 | |
446 | return 0; |
440 | return 0; |
447 | } |
441 | } |
448 | |
442 | |
449 | /* When the map is loaded, load_object does not actually insert objects |
443 | /* 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 |
444 | * into inventory, but just links them. What this does is go through |
… | |
… | |
477 | * for objects whose arch says they are multipart yet according to the |
471 | * for objects whose arch says they are multipart yet according to the |
478 | * info we have, they only have the head (as would be expected when |
472 | * info we have, they only have the head (as would be expected when |
479 | * they are saved). We do have to look for the old maps that did save |
473 | * they are saved). We do have to look for the old maps that did save |
480 | * the more sections and not re-add sections for them. |
474 | * the more sections and not re-add sections for them. |
481 | */ |
475 | */ |
482 | |
|
|
483 | static void |
476 | static void |
484 | link_multipart_objects (maptile *m) |
477 | link_multipart_objects (maptile *m) |
485 | { |
478 | { |
486 | int x, y; |
479 | int x, y; |
487 | object *tmp, *op, *last, *above; |
480 | object *tmp, *op, *last, *above; |
488 | archetype *at; |
481 | archetype *at; |
489 | |
482 | |
490 | for (x = 0; x < MAP_WIDTH (m); x++) |
483 | for (x = 0; x < m->width; x++) |
491 | for (y = 0; y < MAP_HEIGHT (m); y++) |
484 | for (y = 0; y < m->height; y++) |
492 | for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) |
485 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) |
493 | { |
486 | { |
494 | above = tmp->above; |
487 | above = tmp->above; |
495 | |
488 | |
496 | /* already multipart - don't do anything more */ |
489 | /* already multipart - don't do anything more */ |
497 | if (tmp->head || tmp->more) |
490 | if (tmp->head || tmp->more) |
… | |
… | |
547 | { |
540 | { |
548 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
541 | LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); |
549 | continue; |
542 | continue; |
550 | } |
543 | } |
551 | |
544 | |
552 | |
|
|
553 | switch (i) |
545 | switch (i) |
554 | { |
546 | { |
555 | case LL_NORMAL: |
547 | case LL_NORMAL: |
556 | /* if we are loading an overlay, put the floors on the bottom */ |
548 | /* 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) |
549 | if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) |
558 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); |
550 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); |
559 | else |
551 | else |
560 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
552 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); |
561 | |
553 | |
562 | if (op->inv) |
554 | if (op->inv) |
563 | sum_weight (op); |
555 | sum_weight (op); |
564 | |
556 | |
565 | prev = op, last_more = op; |
557 | prev = op, last_more = op; |
566 | break; |
558 | break; |
567 | |
559 | |
568 | case LL_MORE: |
560 | case LL_MORE: |
569 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
561 | insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); |
570 | op->head = prev, last_more->more = op, last_more = op; |
562 | op->head = prev, last_more->more = op, last_more = op; |
571 | break; |
563 | break; |
572 | } |
564 | } |
573 | |
565 | |
574 | if (mapflags & MAP_STYLE) |
566 | if (mapflags & MAP_STYLE) |
575 | remove_from_active_list (op); |
567 | remove_from_active_list (op); |
576 | |
568 | |
… | |
… | |
582 | { |
574 | { |
583 | for (j = 0; j < m->height; j++) |
575 | for (j = 0; j < m->height; j++) |
584 | { |
576 | { |
585 | unique = 0; |
577 | unique = 0; |
586 | /* check for unique items, or unique squares */ |
578 | /* check for unique items, or unique squares */ |
587 | for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) |
579 | for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) |
588 | { |
580 | { |
589 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
581 | if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) |
590 | unique = 1; |
582 | unique = 1; |
|
|
583 | |
591 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
584 | if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) |
592 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
585 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
593 | } |
586 | } |
594 | } |
587 | } |
595 | } |
588 | } |
… | |
… | |
602 | * Modified by MSW 2001-07-01 to do in a single pass - reduces code, |
595 | * Modified by MSW 2001-07-01 to do in a single pass - reduces code, |
603 | * and we only save the head of multi part objects - this is needed |
596 | * and we only save the head of multi part objects - this is needed |
604 | * in order to do map tiling properly. |
597 | * in order to do map tiling properly. |
605 | */ |
598 | */ |
606 | void |
599 | void |
607 | save_objects (maptile *m, object_freezer & fp, object_freezer & fp2, int flag) |
600 | save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag) |
608 | { |
601 | { |
609 | int i, j = 0, unique = 0; |
602 | int i, j = 0, unique = 0; |
610 | object *op; |
603 | object *op; |
611 | |
604 | |
612 | /* first pass - save one-part objects */ |
605 | /* first pass - save one-part objects */ |
613 | for (i = 0; i < MAP_WIDTH (m); i++) |
606 | for (i = 0; i < m->width; i++) |
614 | for (j = 0; j < MAP_HEIGHT (m); j++) |
607 | for (j = 0; j < m->height; j++) |
615 | { |
608 | { |
616 | unique = 0; |
609 | unique = 0; |
|
|
610 | |
617 | for (op = get_map_ob (m, i, j); op; op = op->above) |
611 | for (op = m->at (i, j).bot; op; op = op->above) |
618 | { |
612 | { |
619 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
613 | if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) |
620 | unique = 1; |
614 | unique = 1; |
621 | |
615 | |
622 | if (op->type == PLAYER) |
616 | if (!op->can_map_save ()) |
623 | { |
|
|
624 | LOG (llevDebug, "Player on map that is being saved\n"); |
|
|
625 | continue; |
|
|
626 | } |
|
|
627 | |
|
|
628 | if (op->head || op->owner) |
|
|
629 | continue; |
617 | continue; |
630 | |
618 | |
631 | if (unique || QUERY_FLAG (op, FLAG_UNIQUE)) |
619 | if (unique || op->flag [FLAG_UNIQUE]) |
632 | save_object (fp2, op, 3); |
620 | save_object (fp2, op, 1); |
633 | else if (flag == 0 || (flag == 2 && (!QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) && !QUERY_FLAG (op, FLAG_UNPAID)))) |
621 | else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID]))) |
634 | save_object (fp, op, 3); |
622 | save_object (fp, op, 1); |
635 | |
623 | } |
636 | } /* for this space */ |
624 | } |
637 | } /* for this j */ |
|
|
638 | } |
625 | } |
639 | |
626 | |
640 | maptile::maptile () |
627 | maptile::maptile () |
641 | { |
628 | { |
642 | in_memory = MAP_SWAPPED; |
629 | in_memory = MAP_SWAPPED; |
|
|
630 | |
643 | /* The maps used to pick up default x and y values from the |
631 | /* The maps used to pick up default x and y values from the |
644 | * map archetype. Mimic that behaviour. |
632 | * map archetype. Mimic that behaviour. |
645 | */ |
633 | */ |
646 | MAP_WIDTH (this) = 16; |
634 | width = 16; |
647 | MAP_HEIGHT (this) = 16; |
635 | height = 16; |
648 | MAP_RESET_TIMEOUT (this) = 0; |
636 | reset_timeout = 0; |
649 | MAP_TIMEOUT (this) = 300; |
637 | timeout = 300; |
650 | MAP_ENTER_X (this) = 0; |
638 | enter_x = 0; |
651 | MAP_ENTER_Y (this) = 0; |
639 | enter_y = 0; |
652 | /*set part to -1 indicating conversion to weather map not yet done */ |
640 | /*set part to -1 indicating conversion to weather map not yet done */ |
653 | MAP_WORLDPARTX (this) = -1; |
641 | worldpartx = -1; |
654 | MAP_WORLDPARTY (this) = -1; |
642 | worldparty = -1; |
|
|
643 | } |
|
|
644 | |
|
|
645 | void |
|
|
646 | maptile::link () |
|
|
647 | { |
|
|
648 | next = first_map; |
|
|
649 | first_map = this; |
|
|
650 | } |
|
|
651 | |
|
|
652 | void |
|
|
653 | maptile::unlink () |
|
|
654 | { |
|
|
655 | if (first_map == this) |
|
|
656 | first_map = next; |
|
|
657 | else |
|
|
658 | for_all_maps (m) |
|
|
659 | if (m->next = this) |
|
|
660 | { |
|
|
661 | m->next = next; |
|
|
662 | break; |
|
|
663 | } |
655 | } |
664 | } |
656 | |
665 | |
657 | /* |
666 | /* |
658 | * Allocates, initialises, and returns a pointer to a maptile. |
667 | * Allocates, initialises, and returns a pointer to a maptile. |
659 | * Modified to no longer take a path option which was not being |
668 | * Modified to no longer take a path option which was not being |
660 | * used anyways. MSW 2001-07-01 |
669 | * used anyways. MSW 2001-07-01 |
661 | */ |
670 | */ |
662 | maptile * |
671 | maptile * |
663 | get_linked_map (void) |
672 | get_linked_map (void) |
664 | { |
673 | { |
665 | maptile *mp, *map = new maptile; |
674 | maptile *map = new maptile; |
666 | |
675 | map->link (); |
667 | for (mp = first_map; mp && mp->next; mp = mp->next); |
|
|
668 | |
|
|
669 | if (mp == NULL) |
|
|
670 | first_map = map; |
|
|
671 | else |
|
|
672 | mp->next = map; |
|
|
673 | |
|
|
674 | return map; |
676 | return map; |
675 | } |
677 | } |
676 | |
678 | |
677 | /* |
679 | /* |
678 | * Allocates the arrays contained in a maptile. |
680 | * Allocates the arrays contained in a maptile. |
… | |
… | |
689 | * that is their poor assumption. |
691 | * that is their poor assumption. |
690 | */ |
692 | */ |
691 | if (spaces) |
693 | if (spaces) |
692 | { |
694 | { |
693 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
695 | LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); |
694 | free (spaces); |
696 | sfree (spaces, size ()); |
695 | } |
697 | } |
696 | |
698 | |
697 | spaces = (MapSpace *) |
699 | spaces = salloc0<mapspace> (size ()); |
698 | calloc (1, width * height * sizeof (MapSpace)); |
|
|
699 | |
|
|
700 | if (!spaces) |
|
|
701 | fatal (OUT_OF_MEMORY); |
|
|
702 | } |
700 | } |
703 | |
701 | |
704 | /* Create and returns a map of the specific size. Used |
702 | /* Create and returns a map of the specific size. Used |
705 | * in random map code and the editor. |
703 | * in random map code and the editor. |
706 | */ |
704 | */ |
… | |
… | |
729 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
727 | char *shop_string, *p, *q, *next_semicolon, *next_colon; |
730 | shopitems *items = NULL; |
728 | shopitems *items = NULL; |
731 | int i = 0, number_of_entries = 0; |
729 | int i = 0, number_of_entries = 0; |
732 | const typedata *current_type; |
730 | const typedata *current_type; |
733 | |
731 | |
734 | shop_string = strdup_local (input_string); |
732 | shop_string = strdup (input_string); |
735 | p = shop_string; |
733 | p = shop_string; |
736 | /* first we'll count the entries, we'll need that for allocating the array shortly */ |
734 | /* first we'll count the entries, we'll need that for allocating the array shortly */ |
737 | while (p) |
735 | while (p) |
738 | { |
736 | { |
739 | p = strchr (p, ';'); |
737 | p = strchr (p, ';'); |
740 | number_of_entries++; |
738 | number_of_entries++; |
741 | if (p) |
739 | if (p) |
742 | p++; |
740 | p++; |
743 | } |
741 | } |
|
|
742 | |
744 | p = shop_string; |
743 | p = shop_string; |
745 | strip_endline (p); |
744 | strip_endline (p); |
746 | items = new shopitems[number_of_entries + 1]; |
745 | items = new shopitems[number_of_entries + 1]; |
747 | for (i = 0; i < number_of_entries; i++) |
746 | for (i = 0; i < number_of_entries; i++) |
748 | { |
747 | { |
749 | if (!p) |
748 | if (!p) |
750 | { |
749 | { |
751 | LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); |
750 | LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); |
752 | break; |
751 | break; |
753 | } |
752 | } |
|
|
753 | |
754 | next_semicolon = strchr (p, ';'); |
754 | next_semicolon = strchr (p, ';'); |
755 | next_colon = strchr (p, ':'); |
755 | next_colon = strchr (p, ':'); |
756 | /* if there is a stregth specified, figure out what it is, we'll need it soon. */ |
756 | /* if there is a stregth specified, figure out what it is, we'll need it soon. */ |
757 | if (next_colon && (!next_semicolon || next_colon < next_semicolon)) |
757 | if (next_colon && (!next_semicolon || next_colon < next_semicolon)) |
758 | items[i].strength = atoi (strchr (p, ':') + 1); |
758 | items[i].strength = atoi (strchr (p, ':') + 1); |
… | |
… | |
785 | * the next entry while we're at it, better print a warning |
785 | * the next entry while we're at it, better print a warning |
786 | */ |
786 | */ |
787 | LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); |
787 | LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); |
788 | } |
788 | } |
789 | } |
789 | } |
|
|
790 | |
790 | items[i].index = number_of_entries; |
791 | items[i].index = number_of_entries; |
791 | if (next_semicolon) |
792 | if (next_semicolon) |
792 | p = ++next_semicolon; |
793 | p = ++next_semicolon; |
793 | else |
794 | else |
794 | p = NULL; |
795 | p = NULL; |
795 | } |
796 | } |
|
|
797 | |
796 | free (shop_string); |
798 | free (shop_string); |
797 | return items; |
799 | return items; |
798 | } |
800 | } |
799 | |
801 | |
800 | /* opposite of parse string, this puts the string that was originally fed in to |
802 | /* opposite of parse string, this puts the string that was originally fed in to |
… | |
… | |
809 | for (i = 0; i < m->shopitems[0].index; i++) |
811 | for (i = 0; i < m->shopitems[0].index; i++) |
810 | { |
812 | { |
811 | if (m->shopitems[i].typenum) |
813 | if (m->shopitems[i].typenum) |
812 | { |
814 | { |
813 | if (m->shopitems[i].strength) |
815 | if (m->shopitems[i].strength) |
814 | { |
|
|
815 | sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); |
816 | sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); |
816 | } |
|
|
817 | else |
817 | else |
818 | sprintf (tmp, "%s;", m->shopitems[i].name); |
818 | sprintf (tmp, "%s;", m->shopitems[i].name); |
819 | } |
819 | } |
820 | else |
820 | else |
821 | { |
821 | { |
822 | if (m->shopitems[i].strength) |
822 | if (m->shopitems[i].strength) |
823 | { |
|
|
824 | sprintf (tmp, "*:%d;", m->shopitems[i].strength); |
823 | sprintf (tmp, "*:%d;", m->shopitems[i].strength); |
825 | } |
|
|
826 | else |
824 | else |
827 | sprintf (tmp, "*"); |
825 | sprintf (tmp, "*"); |
828 | } |
826 | } |
|
|
827 | |
829 | strcat (output_string, tmp); |
828 | strcat (output_string, tmp); |
830 | } |
829 | } |
831 | } |
830 | } |
832 | |
831 | |
833 | /* This loads the header information of the map. The header |
832 | /* This loads the header information of the map. The header |
… | |
… | |
925 | * with nothing between). There is no reason in those cases to |
924 | * with nothing between). There is no reason in those cases to |
926 | * keep the empty message. Also, msgbuf contains garbage data |
925 | * keep the empty message. Also, msgbuf contains garbage data |
927 | * when msgpos is zero, so copying it results in crashes |
926 | * when msgpos is zero, so copying it results in crashes |
928 | */ |
927 | */ |
929 | if (msgpos != 0) |
928 | if (msgpos != 0) |
930 | m->msg = strdup_local (msgbuf); |
929 | m->msg = strdup (msgbuf); |
931 | } |
930 | } |
932 | else if (!strcmp (key, "maplore")) |
931 | else if (!strcmp (key, "maplore")) |
933 | { |
932 | { |
934 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
933 | while (fgets (buf, HUGE_BUF, fp) != NULL) |
935 | { |
934 | { |
… | |
… | |
941 | strcpy (maplorebuf + maplorepos, buf); |
940 | strcpy (maplorebuf + maplorepos, buf); |
942 | maplorepos += strlen (buf); |
941 | maplorepos += strlen (buf); |
943 | } |
942 | } |
944 | } |
943 | } |
945 | if (maplorepos != 0) |
944 | if (maplorepos != 0) |
946 | m->maplore = strdup_local (maplorebuf); |
945 | m->maplore = strdup (maplorebuf); |
947 | } |
946 | } |
948 | else if (!strcmp (key, "end")) |
947 | else if (!strcmp (key, "end")) |
949 | { |
948 | { |
950 | break; |
949 | break; |
951 | } |
950 | } |
… | |
… | |
960 | LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); |
959 | LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); |
961 | } |
960 | } |
962 | else if (!strcmp (key, "name")) |
961 | else if (!strcmp (key, "name")) |
963 | { |
962 | { |
964 | *end = 0; |
963 | *end = 0; |
965 | m->name = strdup_local (value); |
964 | m->name = strdup (value); |
966 | } |
965 | } |
967 | /* first strcmp value on these are old names supported |
966 | /* first strcmp value on these are old names supported |
968 | * for compatibility reasons. The new values (second) are |
967 | * for compatibility reasons. The new values (second) are |
969 | * what really should be used. |
968 | * what really should be used. |
970 | */ |
969 | */ |
971 | else if (!strcmp (key, "oid")) |
970 | else if (!strcmp (key, "oid")) |
972 | { |
|
|
973 | fp.get (m, atoi (value)); |
971 | fp.get (m, atoi (value)); |
974 | } |
|
|
975 | else if (!strcmp (key, "attach")) |
972 | else if (!strcmp (key, "attach")) |
976 | { |
|
|
977 | m->attach = value; |
973 | m->attach = value; |
978 | } |
|
|
979 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
974 | else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) |
980 | { |
|
|
981 | m->enter_x = atoi (value); |
975 | m->enter_x = atoi (value); |
982 | } |
|
|
983 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
976 | else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) |
984 | { |
|
|
985 | m->enter_y = atoi (value); |
977 | m->enter_y = atoi (value); |
986 | } |
|
|
987 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
978 | else if (!strcmp (key, "x") || !strcmp (key, "width")) |
988 | { |
|
|
989 | m->width = atoi (value); |
979 | m->width = atoi (value); |
990 | } |
|
|
991 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
980 | else if (!strcmp (key, "y") || !strcmp (key, "height")) |
992 | { |
|
|
993 | m->height = atoi (value); |
981 | m->height = atoi (value); |
994 | } |
|
|
995 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
982 | else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) |
996 | { |
|
|
997 | m->reset_timeout = atoi (value); |
983 | m->reset_timeout = atoi (value); |
998 | } |
|
|
999 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
984 | else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) |
1000 | { |
|
|
1001 | m->timeout = atoi (value); |
985 | m->timeout = atoi (value); |
1002 | } |
|
|
1003 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
986 | else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) |
1004 | { |
987 | m->difficulty = clamp (atoi (value), 1, settings.max_level); |
1005 | m->difficulty = atoi (value); |
|
|
1006 | } |
|
|
1007 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
988 | else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) |
1008 | { |
|
|
1009 | m->darkness = atoi (value); |
989 | m->darkness = atoi (value); |
1010 | } |
|
|
1011 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
990 | else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) |
1012 | { |
|
|
1013 | m->fixed_resettime = atoi (value); |
991 | m->fixed_resettime = atoi (value); |
1014 | } |
|
|
1015 | else if (!strcmp (key, "unique")) |
992 | else if (!strcmp (key, "unique")) |
1016 | { |
|
|
1017 | m->unique = atoi (value); |
993 | m->unique = atoi (value); |
1018 | } |
|
|
1019 | else if (!strcmp (key, "template")) |
994 | else if (!strcmp (key, "template")) |
1020 | { |
|
|
1021 | m->templatemap = atoi (value); |
995 | m->templatemap = atoi (value); |
1022 | } |
|
|
1023 | else if (!strcmp (key, "region")) |
996 | else if (!strcmp (key, "region")) |
1024 | { |
|
|
1025 | m->region = get_region_by_name (value); |
997 | m->region = get_region_by_name (value); |
1026 | } |
|
|
1027 | else if (!strcmp (key, "shopitems")) |
998 | else if (!strcmp (key, "shopitems")) |
1028 | { |
999 | { |
1029 | *end = 0; |
1000 | *end = 0; |
1030 | m->shopitems = parse_shop_string (value); |
1001 | m->shopitems = parse_shop_string (value); |
1031 | } |
1002 | } |
1032 | else if (!strcmp (key, "shopgreed")) |
1003 | else if (!strcmp (key, "shopgreed")) |
1033 | { |
|
|
1034 | m->shopgreed = atof (value); |
1004 | m->shopgreed = atof (value); |
1035 | } |
|
|
1036 | else if (!strcmp (key, "shopmin")) |
1005 | else if (!strcmp (key, "shopmin")) |
1037 | { |
|
|
1038 | m->shopmin = atol (value); |
1006 | m->shopmin = atol (value); |
1039 | } |
|
|
1040 | else if (!strcmp (key, "shopmax")) |
1007 | else if (!strcmp (key, "shopmax")) |
1041 | { |
|
|
1042 | m->shopmax = atol (value); |
1008 | m->shopmax = atol (value); |
1043 | } |
|
|
1044 | else if (!strcmp (key, "shoprace")) |
1009 | else if (!strcmp (key, "shoprace")) |
1045 | { |
1010 | { |
1046 | *end = 0; |
1011 | *end = 0; |
1047 | m->shoprace = strdup_local (value); |
1012 | m->shoprace = strdup (value); |
1048 | } |
1013 | } |
1049 | else if (!strcmp (key, "outdoor")) |
1014 | else if (!strcmp (key, "outdoor")) |
1050 | { |
|
|
1051 | m->outdoor = atoi (value); |
1015 | m->outdoor = atoi (value); |
1052 | } |
|
|
1053 | else if (!strcmp (key, "temp")) |
1016 | else if (!strcmp (key, "temp")) |
1054 | { |
|
|
1055 | m->temp = atoi (value); |
1017 | m->temp = atoi (value); |
1056 | } |
|
|
1057 | else if (!strcmp (key, "pressure")) |
1018 | else if (!strcmp (key, "pressure")) |
1058 | { |
|
|
1059 | m->pressure = atoi (value); |
1019 | m->pressure = atoi (value); |
1060 | } |
|
|
1061 | else if (!strcmp (key, "humid")) |
1020 | else if (!strcmp (key, "humid")) |
1062 | { |
|
|
1063 | m->humid = atoi (value); |
1021 | m->humid = atoi (value); |
1064 | } |
|
|
1065 | else if (!strcmp (key, "windspeed")) |
1022 | else if (!strcmp (key, "windspeed")) |
1066 | { |
|
|
1067 | m->windspeed = atoi (value); |
1023 | m->windspeed = atoi (value); |
1068 | } |
|
|
1069 | else if (!strcmp (key, "winddir")) |
1024 | else if (!strcmp (key, "winddir")) |
1070 | { |
|
|
1071 | m->winddir = atoi (value); |
1025 | m->winddir = atoi (value); |
1072 | } |
|
|
1073 | else if (!strcmp (key, "sky")) |
1026 | else if (!strcmp (key, "sky")) |
1074 | { |
|
|
1075 | m->sky = atoi (value); |
1027 | m->sky = atoi (value); |
1076 | } |
|
|
1077 | else if (!strcmp (key, "nosmooth")) |
1028 | else if (!strcmp (key, "nosmooth")) |
1078 | { |
|
|
1079 | m->nosmooth = atoi (value); |
1029 | m->nosmooth = atoi (value); |
1080 | } |
|
|
1081 | else if (!strncmp (key, "tile_path_", 10)) |
1030 | else if (!strncmp (key, "tile_path_", 10)) |
1082 | { |
1031 | { |
1083 | int tile = atoi (key + 10); |
1032 | int tile = atoi (key + 10); |
1084 | |
1033 | |
1085 | if (tile < 1 || tile > 4) |
1034 | if (tile < 1 || tile > 4) |
… | |
… | |
1118 | } |
1067 | } |
1119 | |
1068 | |
1120 | if (editor) |
1069 | if (editor) |
1121 | { |
1070 | { |
1122 | /* Use the value as in the file. */ |
1071 | /* Use the value as in the file. */ |
1123 | m->tile_path[tile - 1] = strdup_local (value); |
1072 | m->tile_path[tile - 1] = strdup (value); |
1124 | } |
1073 | } |
1125 | else if (path != NULL) |
1074 | else if (path != NULL) |
1126 | { |
1075 | { |
1127 | /* Use the normalized value. */ |
1076 | /* Use the normalized value. */ |
1128 | m->tile_path[tile - 1] = strdup_local (path); |
1077 | m->tile_path[tile - 1] = strdup (path); |
1129 | } |
1078 | } |
1130 | } /* end if tile direction (in)valid */ |
1079 | } /* end if tile direction (in)valid */ |
1131 | } |
1080 | } |
1132 | else |
1081 | else |
1133 | { |
|
|
1134 | LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); |
1082 | LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); |
1135 | } |
|
|
1136 | } |
1083 | } |
|
|
1084 | |
1137 | if (!key || strcmp (key, "end")) |
1085 | if (!key || strcmp (key, "end")) |
1138 | { |
1086 | { |
1139 | LOG (llevError, "Got premature eof on map header!\n"); |
1087 | LOG (llevError, "Got premature eof on map header!\n"); |
1140 | return 1; |
1088 | return 1; |
1141 | } |
1089 | } |
|
|
1090 | |
1142 | return 0; |
1091 | return 0; |
1143 | } |
1092 | } |
1144 | |
1093 | |
1145 | /* |
1094 | /* |
1146 | * Opens the file "filename" and reads information about the map |
1095 | * Opens the file "filename" and reads information about the map |
… | |
… | |
1151 | * MAP_BLOCK, in which case we block on this load. This happens in all |
1100 | * MAP_BLOCK, in which case we block on this load. This happens in all |
1152 | * cases, no matter if this flag is set or not. |
1101 | * cases, no matter if this flag is set or not. |
1153 | * MAP_STYLE: style map - don't add active objects, don't add to server |
1102 | * MAP_STYLE: style map - don't add active objects, don't add to server |
1154 | * managed map list. |
1103 | * managed map list. |
1155 | */ |
1104 | */ |
1156 | |
|
|
1157 | maptile * |
1105 | maptile * |
1158 | load_original_map (const char *filename, int flags) |
1106 | load_original_map (const char *filename, int flags) |
1159 | { |
1107 | { |
1160 | maptile *m; |
1108 | maptile *m; |
1161 | char pathname[MAX_BUF]; |
1109 | char pathname[MAX_BUF]; |
… | |
… | |
1179 | strcpy (m->path, filename); |
1127 | strcpy (m->path, filename); |
1180 | if (load_map_header (thawer, m)) |
1128 | if (load_map_header (thawer, m)) |
1181 | { |
1129 | { |
1182 | LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); |
1130 | LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); |
1183 | delete_map (m); |
1131 | delete_map (m); |
1184 | return NULL; |
1132 | return 0; |
1185 | } |
1133 | } |
1186 | |
1134 | |
1187 | m->allocate (); |
1135 | m->allocate (); |
1188 | |
1136 | |
1189 | m->in_memory = MAP_LOADING; |
1137 | m->in_memory = MAP_LOADING; |
1190 | load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); |
1138 | load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); |
1191 | |
1139 | |
1192 | m->in_memory = MAP_IN_MEMORY; |
1140 | m->in_memory = MAP_IN_MEMORY; |
1193 | if (!MAP_DIFFICULTY (m)) |
1141 | if (!m->difficulty) |
1194 | MAP_DIFFICULTY (m) = calculate_difficulty (m); |
1142 | m->difficulty = calculate_difficulty (m); |
1195 | set_map_reset_time (m); |
1143 | set_map_reset_time (m); |
1196 | m->instantiate (); |
1144 | m->instantiate (); |
1197 | return (m); |
1145 | return (m); |
1198 | } |
1146 | } |
1199 | |
1147 | |
1200 | /* |
1148 | /* |
1201 | * Loads a map, which has been loaded earlier, from file. |
1149 | * Loads a map, which has been loaded earlier, from file. |
1202 | * Return the map object we load into (this can change from the passed |
1150 | * Return the map object we load into (this can change from the passed |
1203 | * option if we can't find the original map) |
1151 | * option if we can't find the original map) |
1204 | */ |
1152 | */ |
1205 | |
|
|
1206 | static maptile * |
1153 | static maptile * |
1207 | load_temporary_map (maptile *m) |
1154 | load_temporary_map (maptile *m) |
1208 | { |
1155 | { |
1209 | char buf[MAX_BUF]; |
1156 | char buf[MAX_BUF]; |
1210 | |
1157 | |
… | |
… | |
1254 | /* |
1201 | /* |
1255 | * Loads a map, which has been loaded earlier, from file. |
1202 | * Loads a map, which has been loaded earlier, from file. |
1256 | * Return the map object we load into (this can change from the passed |
1203 | * Return the map object we load into (this can change from the passed |
1257 | * option if we can't find the original map) |
1204 | * option if we can't find the original map) |
1258 | */ |
1205 | */ |
1259 | |
|
|
1260 | maptile * |
1206 | maptile * |
1261 | load_overlay_map (const char *filename, maptile *m) |
1207 | load_overlay_map (const char *filename, maptile *m) |
1262 | { |
1208 | { |
1263 | char pathname[MAX_BUF]; |
1209 | char pathname[MAX_BUF]; |
1264 | |
1210 | |
… | |
… | |
1272 | if (load_map_header (thawer, m)) |
1218 | if (load_map_header (thawer, m)) |
1273 | { |
1219 | { |
1274 | LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); |
1220 | LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); |
1275 | delete_map (m); |
1221 | delete_map (m); |
1276 | m = load_original_map (m->path, 0); |
1222 | m = load_original_map (m->path, 0); |
1277 | return NULL; |
1223 | return 0; |
1278 | } |
1224 | } |
1279 | /*m->allocate ();*/ |
1225 | /*m->allocate ();*/ |
1280 | |
1226 | |
1281 | m->in_memory = MAP_LOADING; |
1227 | m->in_memory = MAP_LOADING; |
1282 | load_objects (m, thawer, MAP_OVERLAY); |
1228 | load_objects (m, thawer, MAP_OVERLAY); |
… | |
… | |
1294 | delete_unique_items (maptile *m) |
1240 | delete_unique_items (maptile *m) |
1295 | { |
1241 | { |
1296 | int i, j, unique; |
1242 | int i, j, unique; |
1297 | object *op, *next; |
1243 | object *op, *next; |
1298 | |
1244 | |
1299 | for (i = 0; i < MAP_WIDTH (m); i++) |
1245 | for (i = 0; i < m->width; i++) |
1300 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1246 | for (j = 0; j < m->height; j++) |
1301 | { |
1247 | { |
1302 | unique = 0; |
1248 | unique = 0; |
1303 | |
1249 | |
1304 | for (op = get_map_ob (m, i, j); op; op = next) |
1250 | for (op = GET_MAP_OB (m, i, j); op; op = next) |
1305 | { |
1251 | { |
1306 | next = op->above; |
1252 | next = op->above; |
1307 | |
1253 | |
1308 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
1254 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
1309 | unique = 1; |
1255 | unique = 1; |
1310 | |
1256 | |
1311 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1257 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1312 | { |
1258 | { |
1313 | clean_object (op); |
1259 | op->destroy_inv (false); |
1314 | |
|
|
1315 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
|
|
1316 | remove_button_link (op); |
|
|
1317 | |
|
|
1318 | op->destroy (); |
1260 | op->destroy (); |
1319 | } |
1261 | } |
1320 | } |
1262 | } |
1321 | } |
1263 | } |
1322 | } |
1264 | } |
1323 | |
1265 | |
1324 | |
|
|
1325 | /* |
1266 | /* |
1326 | * Loads unique objects from file(s) into the map which is in memory |
1267 | * Loads unique objects from file(s) into the map which is in memory |
1327 | * m is the map to load unique items into. |
1268 | * m is the map to load unique items into. |
1328 | */ |
1269 | */ |
1329 | static void |
1270 | static void |
… | |
… | |
1348 | return; |
1289 | return; |
1349 | |
1290 | |
1350 | m->in_memory = MAP_LOADING; |
1291 | m->in_memory = MAP_LOADING; |
1351 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1292 | if (m->tmpname == NULL) /* if we have loaded unique items from */ |
1352 | delete_unique_items (m); /* original map before, don't duplicate them */ |
1293 | delete_unique_items (m); /* original map before, don't duplicate them */ |
|
|
1294 | |
1353 | load_objects (m, thawer, 0); |
1295 | load_objects (m, thawer, 0); |
1354 | |
1296 | |
1355 | m->in_memory = MAP_IN_MEMORY; |
1297 | m->in_memory = MAP_IN_MEMORY; |
1356 | } |
1298 | } |
1357 | |
|
|
1358 | |
1299 | |
1359 | /* |
1300 | /* |
1360 | * Saves a map to file. If flag is set, it is saved into the same |
1301 | * Saves a map to file. If flag is set, it is saved into the same |
1361 | * file it was (originally) loaded from. Otherwise a temporary |
1302 | * file it was (originally) loaded from. Otherwise a temporary |
1362 | * filename will be genarated, and the file will be stored there. |
1303 | * filename will be genarated, and the file will be stored there. |
1363 | * The temporary filename will be stored in the maptileure. |
1304 | * The temporary filename will be stored in the maptileure. |
1364 | * If the map is unique, we also save to the filename in the map |
1305 | * If the map is unique, we also save to the filename in the map |
1365 | * (this should have been updated when first loaded) |
1306 | * (this should have been updated when first loaded) |
1366 | */ |
1307 | */ |
1367 | |
|
|
1368 | int |
1308 | int |
1369 | new_save_map (maptile *m, int flag) |
1309 | new_save_map (maptile *m, int flag) |
1370 | { |
1310 | { |
1371 | char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; |
1311 | char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; |
1372 | int i; |
1312 | int i; |
… | |
… | |
1392 | make_path_to_file (filename); |
1332 | make_path_to_file (filename); |
1393 | } |
1333 | } |
1394 | else |
1334 | else |
1395 | { |
1335 | { |
1396 | if (!m->tmpname) |
1336 | if (!m->tmpname) |
1397 | m->tmpname = tempnam_local (settings.tmpdir, NULL); |
1337 | m->tmpname = tempnam (settings.tmpdir, NULL); |
1398 | |
1338 | |
1399 | strcpy (filename, m->tmpname); |
1339 | strcpy (filename, m->tmpname); |
1400 | } |
1340 | } |
1401 | |
1341 | |
1402 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
1342 | LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); |
… | |
… | |
1504 | freezer.save (filename); |
1444 | freezer.save (filename); |
1505 | |
1445 | |
1506 | return 0; |
1446 | return 0; |
1507 | } |
1447 | } |
1508 | |
1448 | |
1509 | |
|
|
1510 | /* |
|
|
1511 | * Remove and free all objects in the inventory of the given object. |
|
|
1512 | * object.c ? |
|
|
1513 | */ |
|
|
1514 | |
|
|
1515 | void |
|
|
1516 | clean_object (object *op) |
|
|
1517 | { |
|
|
1518 | object *tmp, *next; |
|
|
1519 | |
|
|
1520 | for (tmp = op->inv; tmp; tmp = next) |
|
|
1521 | { |
|
|
1522 | next = tmp->below; |
|
|
1523 | |
|
|
1524 | clean_object (tmp); |
|
|
1525 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
|
|
1526 | remove_button_link (tmp); |
|
|
1527 | |
|
|
1528 | tmp->destroy (); |
|
|
1529 | } |
|
|
1530 | } |
|
|
1531 | |
|
|
1532 | /* |
1449 | /* |
1533 | * Remove and free all objects in the given map. |
1450 | * Remove and free all objects in the given map. |
1534 | */ |
1451 | */ |
1535 | |
|
|
1536 | void |
1452 | void |
1537 | free_all_objects (maptile *m) |
1453 | free_all_objects (maptile *m) |
1538 | { |
1454 | { |
1539 | int i, j; |
1455 | if (!m->spaces) |
1540 | object *op; |
1456 | return; |
1541 | |
1457 | |
1542 | for (i = 0; i < MAP_WIDTH (m); i++) |
1458 | for (int i = 0; i < m->width; i++) |
1543 | for (j = 0; j < MAP_HEIGHT (m); j++) |
1459 | for (int j = 0; j < m->height; j++) |
1544 | { |
1460 | { |
1545 | object *previous_obj = NULL; |
1461 | mapspace &ms = m->at (i, j); |
1546 | |
1462 | |
1547 | while ((op = GET_MAP_OB (m, i, j)) != NULL) |
1463 | while (object *op = ms.bot) |
1548 | { |
1464 | { |
1549 | if (op == previous_obj) |
|
|
1550 | { |
|
|
1551 | LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); |
|
|
1552 | break; |
|
|
1553 | } |
|
|
1554 | |
|
|
1555 | previous_obj = op; |
|
|
1556 | |
|
|
1557 | if (op->head != NULL) |
1465 | if (op->head) |
1558 | op = op->head; |
1466 | op = op->head; |
1559 | |
1467 | |
1560 | /* If the map isn't in memory, free_object will remove and |
1468 | op->destroy_inv (false); |
1561 | * free objects in op's inventory. So let it do the job. |
|
|
1562 | */ |
|
|
1563 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1564 | clean_object (op); |
|
|
1565 | |
|
|
1566 | op->destroy (); |
1469 | op->destroy (); |
1567 | } |
1470 | } |
1568 | } |
1471 | } |
1569 | } |
1472 | } |
1570 | |
1473 | |
1571 | /* |
1474 | /* |
1572 | * Frees everything allocated by the given maptileure. |
1475 | * Frees everything allocated by the given maptileure. |
1573 | * don't free tmpname - our caller is left to do that |
1476 | * don't free tmpname - our caller is left to do that |
1574 | */ |
1477 | */ |
1575 | |
|
|
1576 | void |
1478 | void |
1577 | free_map (maptile *m, int flag) |
1479 | free_map (maptile *m, int flag) |
1578 | { |
1480 | { |
1579 | int i; |
1481 | if (!m->in_memory) //TODO: makes no sense to me? |
1580 | |
|
|
1581 | if (!m->in_memory) |
|
|
1582 | { |
|
|
1583 | LOG (llevError, "Trying to free freed map.\n"); |
|
|
1584 | return; |
1482 | return; |
1585 | } |
1483 | |
|
|
1484 | m->in_memory = MAP_SAVING; |
|
|
1485 | |
|
|
1486 | // TODO: use new/delete |
|
|
1487 | |
1586 | if (flag && m->spaces) |
1488 | if (flag && m->spaces) |
1587 | free_all_objects (m); |
1489 | free_all_objects (m); |
1588 | if (m->name) |
1490 | |
1589 | FREE_AND_CLEAR (m->name); |
1491 | sfree (m->spaces, m->size ()), m->spaces = 0; |
1590 | if (m->spaces) |
1492 | |
1591 | FREE_AND_CLEAR (m->spaces); |
1493 | free (m->name), m->name = 0; |
1592 | if (m->msg) |
1494 | free (m->msg), m->msg = 0; |
1593 | FREE_AND_CLEAR (m->msg); |
1495 | free (m->maplore), m->maplore = 0; |
1594 | if (m->maplore) |
1496 | free (m->shoprace), m->shoprace = 0; |
1595 | FREE_AND_CLEAR (m->maplore); |
1497 | delete [] m->shopitems, m->shopitems = 0; |
1596 | if (m->shopitems) |
1498 | |
1597 | delete[]m->shopitems; |
|
|
1598 | m->shopitems = 0; |
|
|
1599 | if (m->shoprace) |
|
|
1600 | FREE_AND_CLEAR (m->shoprace); |
|
|
1601 | if (m->buttons) |
1499 | if (m->buttons) |
1602 | free_objectlinkpt (m->buttons); |
1500 | free_objectlinkpt (m->buttons), m->buttons = 0; |
1603 | m->buttons = NULL; |
1501 | |
1604 | for (i = 0; i < 4; i++) |
1502 | for (int i = 0; i < 4; i++) |
1605 | { |
1503 | free (m->tile_path[i]), m->tile_path[i] = 0; |
1606 | if (m->tile_path[i]) |
1504 | |
1607 | FREE_AND_CLEAR (m->tile_path[i]); |
|
|
1608 | m->tile_map[i] = NULL; |
|
|
1609 | } |
|
|
1610 | m->in_memory = MAP_SWAPPED; |
1505 | m->in_memory = MAP_SWAPPED; |
1611 | } |
1506 | } |
1612 | |
1507 | |
1613 | /* |
1508 | maptile::~maptile () |
1614 | * function: vanish maptile |
1509 | { |
1615 | * m : pointer to maptile, if NULL no action |
1510 | assert (destroyed ()); |
1616 | * this deletes all the data on the map (freeing pointers) |
1511 | } |
1617 | * and then removes this map from the global linked list of maps. |
1512 | |
|
|
1513 | void |
|
|
1514 | maptile::do_destroy () |
|
|
1515 | { |
|
|
1516 | attachable::do_destroy (); |
|
|
1517 | |
|
|
1518 | unlink (); |
|
|
1519 | |
|
|
1520 | free_map (this, 1); |
|
|
1521 | free (tmpname), tmpname = 0; |
|
|
1522 | |
|
|
1523 | /* We need to look through all the maps and see if any maps |
|
|
1524 | * are pointing at this one for tiling information. Since |
|
|
1525 | * tiling can be asymetric, we just can not look to see which |
|
|
1526 | * maps this map tiles with and clears those. |
1618 | */ |
1527 | */ |
|
|
1528 | //TODO: non-euclidean-tiling MUST GO |
|
|
1529 | for_all_maps (m) |
|
|
1530 | for (int i = 0; i < 4; i++) |
|
|
1531 | if (m->tile_map[i] == this) |
|
|
1532 | m->tile_map[i] = 0; |
|
|
1533 | } |
1619 | |
1534 | |
|
|
1535 | //TODO: must go |
1620 | void |
1536 | void |
1621 | delete_map (maptile *m) |
1537 | delete_map (maptile *m) |
1622 | { |
1538 | { |
1623 | maptile *tmp, *last; |
|
|
1624 | int i; |
|
|
1625 | |
|
|
1626 | if (!m) |
1539 | if (m) |
1627 | return; |
1540 | m->destroy (); |
1628 | |
|
|
1629 | m->clear (); |
|
|
1630 | |
|
|
1631 | if (m->in_memory == MAP_IN_MEMORY) |
|
|
1632 | { |
|
|
1633 | /* change to MAP_SAVING, even though we are not, |
|
|
1634 | * so that remove_ob doesn't do as much work. |
|
|
1635 | */ |
|
|
1636 | m->in_memory = MAP_SAVING; |
|
|
1637 | free_map (m, 1); |
|
|
1638 | } |
|
|
1639 | /* move this out of free_map, since tmpname can still be needed if |
|
|
1640 | * the map is swapped out. |
|
|
1641 | */ |
|
|
1642 | if (m->tmpname) |
|
|
1643 | { |
|
|
1644 | free (m->tmpname); |
|
|
1645 | m->tmpname = NULL; |
|
|
1646 | } |
|
|
1647 | last = NULL; |
|
|
1648 | /* We need to look through all the maps and see if any maps |
|
|
1649 | * are pointing at this one for tiling information. Since |
|
|
1650 | * tiling can be assymetric, we just can not look to see which |
|
|
1651 | * maps this map tiles with and clears those. |
|
|
1652 | */ |
|
|
1653 | for (tmp = first_map; tmp != NULL; tmp = tmp->next) |
|
|
1654 | { |
|
|
1655 | if (tmp->next == m) |
|
|
1656 | last = tmp; |
|
|
1657 | |
|
|
1658 | /* This should hopefully get unrolled on a decent compiler */ |
|
|
1659 | for (i = 0; i < 4; i++) |
|
|
1660 | if (tmp->tile_map[i] == m) |
|
|
1661 | tmp->tile_map[i] = NULL; |
|
|
1662 | } |
|
|
1663 | |
|
|
1664 | /* If last is null, then this should be the first map in the list */ |
|
|
1665 | if (!last) |
|
|
1666 | { |
|
|
1667 | if (m == first_map) |
|
|
1668 | first_map = m->next; |
|
|
1669 | else |
|
|
1670 | /* m->path is a static char, so should hopefully still have |
|
|
1671 | * some useful data in it. |
|
|
1672 | */ |
|
|
1673 | LOG (llevError, "delete_map: Unable to find map %s in list\n", m->path); |
|
|
1674 | } |
|
|
1675 | else |
|
|
1676 | last->next = m->next; |
|
|
1677 | |
|
|
1678 | delete m; |
|
|
1679 | } |
1541 | } |
1680 | |
|
|
1681 | |
|
|
1682 | |
1542 | |
1683 | /* |
1543 | /* |
1684 | * Makes sure the given map is loaded and swapped in. |
1544 | * Makes sure the given map is loaded and swapped in. |
1685 | * name is path name of the map. |
1545 | * name is path name of the map. |
1686 | * flags meaning: |
1546 | * flags meaning: |
… | |
… | |
1689 | * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. |
1549 | * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. |
1690 | * dont do any more name translation on it. |
1550 | * dont do any more name translation on it. |
1691 | * |
1551 | * |
1692 | * Returns a pointer to the given map. |
1552 | * Returns a pointer to the given map. |
1693 | */ |
1553 | */ |
1694 | |
|
|
1695 | maptile * |
1554 | maptile * |
1696 | ready_map_name (const char *name, int flags) |
1555 | ready_map_name (const char *name, int flags) |
1697 | { |
1556 | { |
1698 | maptile *m; |
|
|
1699 | |
|
|
1700 | if (!name) |
1557 | if (!name) |
1701 | return (NULL); |
1558 | return 0; |
1702 | |
1559 | |
1703 | /* Have we been at this level before? */ |
1560 | /* Have we been at this level before? */ |
1704 | m = has_been_loaded (name); |
1561 | maptile *m = has_been_loaded (name); |
1705 | |
1562 | |
1706 | /* Map is good to go, so just return it */ |
1563 | /* Map is good to go, so just return it */ |
1707 | if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) |
1564 | if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) |
1708 | { |
|
|
1709 | return m; |
1565 | return m; |
1710 | } |
|
|
1711 | |
1566 | |
1712 | /* unique maps always get loaded from their original location, and never |
1567 | /* unique maps always get loaded from their original location, and never |
1713 | * a temp location. Likewise, if map_flush is set, or we have never loaded |
1568 | * a temp location. Likewise, if map_flush is set, or we have never loaded |
1714 | * this map, load it now. I removed the reset checking from here - |
1569 | * this map, load it now. I removed the reset checking from here - |
1715 | * it seems the probability of a player trying to enter a map that should |
1570 | * it seems the probability of a player trying to enter a map that should |
… | |
… | |
1717 | * a bit cleaner (and players probably shouldn't rely on exact timing for |
1572 | * a bit cleaner (and players probably shouldn't rely on exact timing for |
1718 | * resets in any case - if they really care, they should use the 'maps command. |
1573 | * resets in any case - if they really care, they should use the 'maps command. |
1719 | */ |
1574 | */ |
1720 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1575 | if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) |
1721 | { |
1576 | { |
1722 | |
|
|
1723 | /* first visit or time to reset */ |
1577 | /* first visit or time to reset */ |
1724 | if (m) |
1578 | if (m) |
1725 | { |
1579 | { |
1726 | clean_tmp_map (m); /* Doesn't make much difference */ |
1580 | clean_tmp_map (m); /* Doesn't make much difference */ |
1727 | delete_map (m); |
1581 | delete_map (m); |
… | |
… | |
1731 | if (flags & MAP_PLAYER_UNIQUE) |
1585 | if (flags & MAP_PLAYER_UNIQUE) |
1732 | LOG (llevDebug, "Trying to load map %s.\n", name); |
1586 | LOG (llevDebug, "Trying to load map %s.\n", name); |
1733 | else |
1587 | else |
1734 | LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); |
1588 | LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); |
1735 | |
1589 | |
1736 | //eval_pv ("$x = Event::time", 1);//D |
|
|
1737 | if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) |
1590 | if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) |
1738 | return (NULL); |
1591 | return (NULL); |
1739 | //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D |
|
|
1740 | |
1592 | |
1741 | fix_auto_apply (m); /* Chests which open as default */ |
1593 | fix_auto_apply (m); /* Chests which open as default */ |
1742 | |
1594 | |
1743 | /* If a player unique map, no extra unique object file to load. |
1595 | /* If a player unique map, no extra unique object file to load. |
1744 | * if from the editor, likewise. |
1596 | * if from the editor, likewise. |
… | |
… | |
1814 | int x, y, i; |
1666 | int x, y, i; |
1815 | long monster_cnt = 0; |
1667 | long monster_cnt = 0; |
1816 | double avgexp = 0; |
1668 | double avgexp = 0; |
1817 | sint64 total_exp = 0; |
1669 | sint64 total_exp = 0; |
1818 | |
1670 | |
1819 | if (MAP_DIFFICULTY (m)) |
1671 | if (m->difficulty) |
1820 | { |
1672 | { |
1821 | LOG (llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); |
1673 | LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty); |
1822 | return MAP_DIFFICULTY (m); |
1674 | return m->difficulty; |
1823 | } |
1675 | } |
1824 | |
1676 | |
1825 | for (x = 0; x < MAP_WIDTH (m); x++) |
1677 | for (x = 0; x < m->width; x++) |
1826 | for (y = 0; y < MAP_HEIGHT (m); y++) |
1678 | for (y = 0; y < m->height; y++) |
1827 | for (op = get_map_ob (m, x, y); op != NULL; op = op->above) |
1679 | for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) |
1828 | { |
1680 | { |
1829 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1681 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
1830 | { |
1682 | { |
1831 | total_exp += op->stats.exp; |
1683 | total_exp += op->stats.exp; |
1832 | monster_cnt++; |
1684 | monster_cnt++; |
… | |
… | |
1880 | if (first_map->in_memory == MAP_SAVING) |
1732 | if (first_map->in_memory == MAP_SAVING) |
1881 | first_map->in_memory = MAP_IN_MEMORY; |
1733 | first_map->in_memory = MAP_IN_MEMORY; |
1882 | delete_map (first_map); |
1734 | delete_map (first_map); |
1883 | real_maps++; |
1735 | real_maps++; |
1884 | } |
1736 | } |
|
|
1737 | |
1885 | LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); |
1738 | LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); |
1886 | } |
1739 | } |
1887 | |
1740 | |
1888 | /* change_map_light() - used to change map light level (darkness) |
1741 | /* change_map_light() - used to change map light level (darkness) |
1889 | * up or down. Returns true if successful. It should now be |
1742 | * up or down. Returns true if successful. It should now be |
… | |
… | |
1925 | /* All clients need to get re-updated for the change */ |
1778 | /* All clients need to get re-updated for the change */ |
1926 | update_all_map_los (m); |
1779 | update_all_map_los (m); |
1927 | return 1; |
1780 | return 1; |
1928 | } |
1781 | } |
1929 | |
1782 | |
1930 | |
|
|
1931 | /* |
1783 | /* |
1932 | * This function updates various attributes about a specific space |
1784 | * This function updates various attributes about a specific space |
1933 | * on the map (what it looks like, whether it blocks magic, |
1785 | * on the map (what it looks like, whether it blocks magic, |
1934 | * has a living creatures, prevents people from passing |
1786 | * has a living creatures, prevents people from passing |
1935 | * through, etc) |
1787 | * through, etc) |
1936 | */ |
1788 | */ |
1937 | void |
1789 | void |
1938 | update_position (maptile *m, int x, int y) |
1790 | mapspace::update_ () |
1939 | { |
1791 | { |
1940 | object *tmp, *last = NULL; |
1792 | object *tmp, *last = 0; |
1941 | uint8 flags = 0, oldflags, light = 0, anywhere = 0; |
1793 | uint8 flags = 0, light = 0, anywhere = 0; |
1942 | New_Face *top, *floor, *middle; |
1794 | New_Face *top, *floor, *middle; |
1943 | object *top_obj, *floor_obj, *middle_obj; |
1795 | object *top_obj, *floor_obj, *middle_obj; |
1944 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1796 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1945 | |
1797 | |
1946 | oldflags = GET_MAP_FLAGS (m, x, y); |
|
|
1947 | if (!(oldflags & P_NEED_UPDATE)) |
|
|
1948 | { |
|
|
1949 | LOG (llevDebug, "update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", m->path, x, y); |
|
|
1950 | return; |
|
|
1951 | } |
|
|
1952 | |
|
|
1953 | middle = blank_face; |
1798 | middle = blank_face; |
1954 | top = blank_face; |
1799 | top = blank_face; |
1955 | floor = blank_face; |
1800 | floor = blank_face; |
1956 | |
1801 | |
1957 | middle_obj = NULL; |
1802 | middle_obj = 0; |
1958 | top_obj = NULL; |
1803 | top_obj = 0; |
1959 | floor_obj = NULL; |
1804 | floor_obj = 0; |
1960 | |
1805 | |
1961 | for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) |
1806 | for (tmp = bot; tmp; last = tmp, tmp = tmp->above) |
1962 | { |
1807 | { |
1963 | |
|
|
1964 | /* This could be made additive I guess (two lights better than |
1808 | /* This could be made additive I guess (two lights better than |
1965 | * one). But if so, it shouldn't be a simple additive - 2 |
1809 | * one). But if so, it shouldn't be a simple additive - 2 |
1966 | * light bulbs do not illuminate twice as far as once since |
1810 | * light bulbs do not illuminate twice as far as once since |
1967 | * it is a disapation factor that is squared (or is it cubed?) |
1811 | * it is a dissapation factor that is cubed. |
1968 | */ |
1812 | */ |
1969 | if (tmp->glow_radius > light) |
1813 | if (tmp->glow_radius > light) |
1970 | light = tmp->glow_radius; |
1814 | light = tmp->glow_radius; |
1971 | |
1815 | |
1972 | /* This call is needed in order to update objects the player |
1816 | /* This call is needed in order to update objects the player |
… | |
… | |
2010 | { |
1854 | { |
2011 | middle = tmp->face; |
1855 | middle = tmp->face; |
2012 | middle_obj = tmp; |
1856 | middle_obj = tmp; |
2013 | } |
1857 | } |
2014 | } |
1858 | } |
|
|
1859 | |
2015 | if (tmp == tmp->above) |
1860 | if (tmp == tmp->above) |
2016 | { |
1861 | { |
2017 | LOG (llevError, "Error in structure of map\n"); |
1862 | LOG (llevError, "Error in structure of map\n"); |
2018 | exit (-1); |
1863 | exit (-1); |
2019 | } |
1864 | } |
2020 | |
1865 | |
2021 | move_slow |= tmp->move_slow; |
1866 | move_slow |= tmp->move_slow; |
2022 | move_block |= tmp->move_block; |
1867 | move_block |= tmp->move_block; |
2023 | move_on |= tmp->move_on; |
1868 | move_on |= tmp->move_on; |
2024 | move_off |= tmp->move_off; |
1869 | move_off |= tmp->move_off; |
2025 | move_allow |= tmp->move_allow; |
1870 | move_allow |= tmp->move_allow; |
2026 | |
1871 | |
2027 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) |
|
|
2028 | flags |= P_IS_ALIVE; |
|
|
2029 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) |
|
|
2030 | flags |= P_NO_MAGIC; |
|
|
2031 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) |
|
|
2032 | flags |= P_NO_CLERIC; |
|
|
2033 | if (tmp->type == SAFE_GROUND) |
|
|
2034 | flags |= P_SAFE; |
|
|
2035 | |
|
|
2036 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) |
1872 | if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; |
2037 | flags |= P_BLOCKSVIEW; |
1873 | if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; |
2038 | } /* for stack of objects */ |
1874 | if (tmp->type == PLAYER) flags |= P_PLAYER; |
2039 | |
1875 | if (tmp->type == SAFE_GROUND) flags |= P_SAFE; |
2040 | /* we don't want to rely on this function to have accurate flags, but |
1876 | if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; |
2041 | * since we're already doing the work, we calculate them here. |
1877 | if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; |
2042 | * if they don't match, logic is broken someplace. |
|
|
2043 | */ |
|
|
2044 | if (((oldflags & ~(P_NEED_UPDATE | P_NO_ERROR)) != flags) && (!(oldflags & P_NO_ERROR))) |
|
|
2045 | { |
1878 | } |
2046 | LOG (llevDebug, "update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", |
1879 | |
2047 | m->path, x, y, (oldflags & ~P_NEED_UPDATE), flags); |
1880 | this->light = light; |
2048 | } |
1881 | this->flags_ = flags; |
2049 | SET_MAP_FLAGS (m, x, y, flags); |
1882 | this->move_block = move_block & ~move_allow; |
2050 | SET_MAP_MOVE_BLOCK (m, x, y, move_block & ~move_allow); |
1883 | this->move_on = move_on; |
2051 | SET_MAP_MOVE_ON (m, x, y, move_on); |
1884 | this->move_off = move_off; |
2052 | SET_MAP_MOVE_OFF (m, x, y, move_off); |
1885 | this->move_slow = move_slow; |
2053 | SET_MAP_MOVE_SLOW (m, x, y, move_slow); |
|
|
2054 | |
1886 | |
2055 | /* At this point, we have a floor face (if there is a floor), |
1887 | /* At this point, we have a floor face (if there is a floor), |
2056 | * and the floor is set - we are not going to touch it at |
1888 | * and the floor is set - we are not going to touch it at |
2057 | * this point. |
1889 | * this point. |
2058 | * middle contains the highest visibility face. |
1890 | * middle contains the highest visibility face. |
… | |
… | |
2112 | break; |
1944 | break; |
2113 | } |
1945 | } |
2114 | } |
1946 | } |
2115 | } |
1947 | } |
2116 | } |
1948 | } |
|
|
1949 | |
2117 | if (middle == floor) |
1950 | if (middle == floor) |
2118 | middle = blank_face; |
1951 | middle = blank_face; |
|
|
1952 | |
2119 | if (top == middle) |
1953 | if (top == middle) |
2120 | middle = blank_face; |
1954 | middle = blank_face; |
2121 | SET_MAP_FACE (m, x, y, top, 0); |
|
|
2122 | if (top != blank_face) |
|
|
2123 | SET_MAP_FACE_OBJ (m, x, y, top_obj, 0); |
|
|
2124 | else |
|
|
2125 | SET_MAP_FACE_OBJ (m, x, y, NULL, 0); |
|
|
2126 | SET_MAP_FACE (m, x, y, middle, 1); |
|
|
2127 | if (middle != blank_face) |
|
|
2128 | SET_MAP_FACE_OBJ (m, x, y, middle_obj, 1); |
|
|
2129 | else |
|
|
2130 | SET_MAP_FACE_OBJ (m, x, y, NULL, 1); |
|
|
2131 | SET_MAP_FACE (m, x, y, floor, 2); |
|
|
2132 | if (floor != blank_face) |
|
|
2133 | SET_MAP_FACE_OBJ (m, x, y, floor_obj, 2); |
|
|
2134 | else |
|
|
2135 | SET_MAP_FACE_OBJ (m, x, y, NULL, 2); |
|
|
2136 | SET_MAP_LIGHT (m, x, y, light); |
|
|
2137 | } |
|
|
2138 | |
1955 | |
|
|
1956 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
|
|
1957 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
|
|
1958 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
|
|
1959 | } |
2139 | |
1960 | |
2140 | void |
1961 | void |
2141 | set_map_reset_time (maptile *map) |
1962 | set_map_reset_time (maptile *map) |
2142 | { |
1963 | { |
2143 | int timeout; |
1964 | int timeout; |
2144 | |
1965 | |
2145 | timeout = MAP_RESET_TIMEOUT (map); |
1966 | timeout = map->reset_timeout; |
2146 | if (timeout <= 0) |
1967 | if (timeout <= 0) |
2147 | timeout = MAP_DEFAULTRESET; |
1968 | timeout = MAP_DEFAULTRESET; |
2148 | if (timeout >= MAP_MAXRESET) |
1969 | if (timeout >= MAP_MAXRESET) |
2149 | timeout = MAP_MAXRESET; |
1970 | timeout = MAP_MAXRESET; |
2150 | MAP_WHEN_RESET (map) = seconds () + timeout; |
1971 | map->reset_time = time (0) + timeout; |
2151 | } |
1972 | } |
2152 | |
1973 | |
2153 | /* this updates the orig_map->tile_map[tile_num] value after loading |
1974 | /* this updates the orig_map->tile_map[tile_num] value after loading |
2154 | * the map. It also takes care of linking back the freshly loaded |
1975 | * the map. It also takes care of linking back the freshly loaded |
2155 | * maps tile_map values if it tiles back to this one. It returns |
1976 | * maps tile_map values if it tiles back to this one. It returns |
… | |
… | |
2183 | * |
2004 | * |
2184 | */ |
2005 | */ |
2185 | int |
2006 | int |
2186 | out_of_map (maptile *m, int x, int y) |
2007 | out_of_map (maptile *m, int x, int y) |
2187 | { |
2008 | { |
2188 | |
|
|
2189 | /* If we get passed a null map, this is obviously the |
2009 | /* If we get passed a null map, this is obviously the |
2190 | * case. This generally shouldn't happen, but if the |
2010 | * case. This generally shouldn't happen, but if the |
2191 | * map loads fail below, it could happen. |
2011 | * map loads fail below, it could happen. |
2192 | */ |
2012 | */ |
2193 | if (!m) |
2013 | if (!m) |
… | |
… | |
2195 | |
2015 | |
2196 | if (x < 0) |
2016 | if (x < 0) |
2197 | { |
2017 | { |
2198 | if (!m->tile_path[3]) |
2018 | if (!m->tile_path[3]) |
2199 | return 1; |
2019 | return 1; |
|
|
2020 | |
2200 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2021 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2201 | { |
|
|
2202 | load_and_link_tiled_map (m, 3); |
2022 | load_and_link_tiled_map (m, 3); |
2203 | } |
2023 | |
2204 | return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), y)); |
2024 | return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); |
2205 | } |
2025 | } |
2206 | if (x >= MAP_WIDTH (m)) |
2026 | |
|
|
2027 | if (x >= m->width) |
2207 | { |
2028 | { |
2208 | if (!m->tile_path[1]) |
2029 | if (!m->tile_path[1]) |
2209 | return 1; |
2030 | return 1; |
|
|
2031 | |
2210 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2032 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2211 | { |
|
|
2212 | load_and_link_tiled_map (m, 1); |
2033 | load_and_link_tiled_map (m, 1); |
2213 | } |
2034 | |
2214 | return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), y)); |
2035 | return (out_of_map (m->tile_map[1], x - m->width, y)); |
2215 | } |
2036 | } |
|
|
2037 | |
2216 | if (y < 0) |
2038 | if (y < 0) |
2217 | { |
2039 | { |
2218 | if (!m->tile_path[0]) |
2040 | if (!m->tile_path[0]) |
2219 | return 1; |
2041 | return 1; |
|
|
2042 | |
2220 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2043 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2221 | { |
|
|
2222 | load_and_link_tiled_map (m, 0); |
2044 | load_and_link_tiled_map (m, 0); |
2223 | } |
2045 | |
2224 | return (out_of_map (m->tile_map[0], x, y + MAP_HEIGHT (m->tile_map[0]))); |
2046 | return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); |
2225 | } |
2047 | } |
2226 | if (y >= MAP_HEIGHT (m)) |
2048 | |
|
|
2049 | if (y >= m->height) |
2227 | { |
2050 | { |
2228 | if (!m->tile_path[2]) |
2051 | if (!m->tile_path[2]) |
2229 | return 1; |
2052 | return 1; |
|
|
2053 | |
2230 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2054 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2231 | { |
|
|
2232 | load_and_link_tiled_map (m, 2); |
2055 | load_and_link_tiled_map (m, 2); |
2233 | } |
2056 | |
2234 | return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); |
2057 | return (out_of_map (m->tile_map[2], x, y - m->height)); |
2235 | } |
2058 | } |
2236 | |
2059 | |
2237 | /* Simple case - coordinates are within this local |
2060 | /* Simple case - coordinates are within this local |
2238 | * map. |
2061 | * map. |
2239 | */ |
2062 | */ |
… | |
… | |
2253 | { |
2076 | { |
2254 | |
2077 | |
2255 | if (*x < 0) |
2078 | if (*x < 0) |
2256 | { |
2079 | { |
2257 | if (!m->tile_path[3]) |
2080 | if (!m->tile_path[3]) |
2258 | return NULL; |
2081 | return 0; |
2259 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2082 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
2260 | load_and_link_tiled_map (m, 3); |
2083 | load_and_link_tiled_map (m, 3); |
2261 | |
2084 | |
2262 | *x += MAP_WIDTH (m->tile_map[3]); |
2085 | *x += m->tile_map[3]->width; |
2263 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2086 | return (get_map_from_coord (m->tile_map[3], x, y)); |
2264 | } |
2087 | } |
2265 | if (*x >= MAP_WIDTH (m)) |
2088 | |
|
|
2089 | if (*x >= m->width) |
2266 | { |
2090 | { |
2267 | if (!m->tile_path[1]) |
2091 | if (!m->tile_path[1]) |
2268 | return NULL; |
2092 | return 0; |
|
|
2093 | |
2269 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2094 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
2270 | load_and_link_tiled_map (m, 1); |
2095 | load_and_link_tiled_map (m, 1); |
2271 | |
2096 | |
2272 | *x -= MAP_WIDTH (m); |
2097 | *x -= m->width; |
2273 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2098 | return (get_map_from_coord (m->tile_map[1], x, y)); |
2274 | } |
2099 | } |
|
|
2100 | |
2275 | if (*y < 0) |
2101 | if (*y < 0) |
2276 | { |
2102 | { |
2277 | if (!m->tile_path[0]) |
2103 | if (!m->tile_path[0]) |
2278 | return NULL; |
2104 | return 0; |
|
|
2105 | |
2279 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2106 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
2280 | load_and_link_tiled_map (m, 0); |
2107 | load_and_link_tiled_map (m, 0); |
2281 | |
2108 | |
2282 | *y += MAP_HEIGHT (m->tile_map[0]); |
2109 | *y += m->tile_map[0]->height; |
2283 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2110 | return (get_map_from_coord (m->tile_map[0], x, y)); |
2284 | } |
2111 | } |
2285 | if (*y >= MAP_HEIGHT (m)) |
2112 | |
|
|
2113 | if (*y >= m->height) |
2286 | { |
2114 | { |
2287 | if (!m->tile_path[2]) |
2115 | if (!m->tile_path[2]) |
2288 | return NULL; |
2116 | return 0; |
|
|
2117 | |
2289 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2118 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
2290 | load_and_link_tiled_map (m, 2); |
2119 | load_and_link_tiled_map (m, 2); |
2291 | |
2120 | |
2292 | *y -= MAP_HEIGHT (m); |
2121 | *y -= m->height; |
2293 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2122 | return (get_map_from_coord (m->tile_map[2], x, y)); |
2294 | } |
2123 | } |
2295 | |
2124 | |
2296 | /* Simple case - coordinates are within this local |
2125 | /* Simple case - coordinates are within this local |
2297 | * map. |
2126 | * map. |
… | |
… | |
2317 | |
2146 | |
2318 | } |
2147 | } |
2319 | else if (map1->tile_map[0] == map2) |
2148 | else if (map1->tile_map[0] == map2) |
2320 | { /* up */ |
2149 | { /* up */ |
2321 | *dx = 0; |
2150 | *dx = 0; |
2322 | *dy = -MAP_HEIGHT (map2); |
2151 | *dy = -map2->height; |
2323 | } |
2152 | } |
2324 | else if (map1->tile_map[1] == map2) |
2153 | else if (map1->tile_map[1] == map2) |
2325 | { /* right */ |
2154 | { /* right */ |
2326 | *dx = MAP_WIDTH (map1); |
2155 | *dx = map1->width; |
2327 | *dy = 0; |
2156 | *dy = 0; |
2328 | } |
2157 | } |
2329 | else if (map1->tile_map[2] == map2) |
2158 | else if (map1->tile_map[2] == map2) |
2330 | { /* down */ |
2159 | { /* down */ |
2331 | *dx = 0; |
2160 | *dx = 0; |
2332 | *dy = MAP_HEIGHT (map1); |
2161 | *dy = map1->height; |
2333 | } |
2162 | } |
2334 | else if (map1->tile_map[3] == map2) |
2163 | else if (map1->tile_map[3] == map2) |
2335 | { /* left */ |
2164 | { /* left */ |
2336 | *dx = -MAP_WIDTH (map2); |
2165 | *dx = -map2->width; |
2337 | *dy = 0; |
2166 | *dy = 0; |
2338 | |
2167 | |
2339 | } |
2168 | } |
2340 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) |
2169 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) |
2341 | { /* up right */ |
2170 | { /* up right */ |
2342 | *dx = MAP_WIDTH (map1->tile_map[0]); |
2171 | *dx = map1->tile_map[0]->width; |
2343 | *dy = -MAP_HEIGHT (map1->tile_map[0]); |
2172 | *dy = -map1->tile_map[0]->height; |
2344 | } |
2173 | } |
2345 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) |
2174 | else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) |
2346 | { /* up left */ |
2175 | { /* up left */ |
2347 | *dx = -MAP_WIDTH (map2); |
2176 | *dx = -map2->width; |
2348 | *dy = -MAP_HEIGHT (map1->tile_map[0]); |
2177 | *dy = -map1->tile_map[0]->height; |
2349 | } |
2178 | } |
2350 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) |
2179 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) |
2351 | { /* right up */ |
2180 | { /* right up */ |
2352 | *dx = MAP_WIDTH (map1); |
2181 | *dx = map1->width; |
2353 | *dy = -MAP_HEIGHT (map2); |
2182 | *dy = -map2->height; |
2354 | } |
2183 | } |
2355 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) |
2184 | else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) |
2356 | { /* right down */ |
2185 | { /* right down */ |
2357 | *dx = MAP_WIDTH (map1); |
2186 | *dx = map1->width; |
2358 | *dy = MAP_HEIGHT (map1->tile_map[1]); |
2187 | *dy = map1->tile_map[1]->height; |
2359 | } |
2188 | } |
2360 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) |
2189 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) |
2361 | { /* down right */ |
2190 | { /* down right */ |
2362 | *dx = MAP_WIDTH (map1->tile_map[2]); |
2191 | *dx = map1->tile_map[2]->width; |
2363 | *dy = MAP_HEIGHT (map1); |
2192 | *dy = map1->height; |
2364 | } |
2193 | } |
2365 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) |
2194 | else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) |
2366 | { /* down left */ |
2195 | { /* down left */ |
2367 | *dx = -MAP_WIDTH (map2); |
2196 | *dx = -map2->width; |
2368 | *dy = MAP_HEIGHT (map1); |
2197 | *dy = map1->height; |
2369 | } |
2198 | } |
2370 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) |
2199 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) |
2371 | { /* left up */ |
2200 | { /* left up */ |
2372 | *dx = -MAP_WIDTH (map1->tile_map[3]); |
2201 | *dx = -map1->tile_map[3]->width; |
2373 | *dy = -MAP_HEIGHT (map2); |
2202 | *dy = -map2->height; |
2374 | } |
2203 | } |
2375 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) |
2204 | else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) |
2376 | { /* left down */ |
2205 | { /* left down */ |
2377 | *dx = -MAP_WIDTH (map1->tile_map[3]); |
2206 | *dx = -map1->tile_map[3]->width; |
2378 | *dy = MAP_HEIGHT (map1->tile_map[3]); |
2207 | *dy = map1->tile_map[3]->height; |
2379 | |
2208 | |
2380 | } |
2209 | } |
2381 | else |
2210 | else |
2382 | { /* not "adjacent" enough */ |
2211 | { /* not "adjacent" enough */ |
2383 | return 0; |
2212 | return 0; |
… | |
… | |
2508 | { |
2337 | { |
2509 | int dx, dy; |
2338 | int dx, dy; |
2510 | |
2339 | |
2511 | return adjacent_map (op1->map, op2->map, &dx, &dy); |
2340 | return adjacent_map (op1->map, op2->map, &dx, &dy); |
2512 | } |
2341 | } |
|
|
2342 | |
|
|
2343 | object * |
|
|
2344 | maptile::insert (object *op, int x, int y, object *originator, int flags) |
|
|
2345 | { |
|
|
2346 | if (!op->flag [FLAG_REMOVED]) |
|
|
2347 | op->remove (); |
|
|
2348 | |
|
|
2349 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
|
|
2350 | } |
|
|
2351 | |