… | |
… | |
739 | { |
739 | { |
740 | keyword kw = thawer.get_kv (); |
740 | keyword kw = thawer.get_kv (); |
741 | |
741 | |
742 | switch (kw) |
742 | switch (kw) |
743 | { |
743 | { |
744 | case KW_EOF: |
|
|
745 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
|
|
746 | return false; |
|
|
747 | |
|
|
748 | case KW_end: |
|
|
749 | return true; |
|
|
750 | |
|
|
751 | default: |
|
|
752 | case KW_ERROR: |
|
|
753 | LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); |
|
|
754 | break; |
|
|
755 | |
|
|
756 | case KW_msg: |
744 | case KW_msg: |
757 | thawer.get_ml (KW_endmsg, msg); |
745 | thawer.get_ml (KW_endmsg, msg); |
758 | break; |
746 | break; |
759 | |
747 | |
760 | case KW_lore: // CF+ extension |
748 | case KW_lore: // CF+ extension |
… | |
… | |
792 | case KW_sky: thawer.get (sky); break; |
780 | case KW_sky: thawer.get (sky); break; |
793 | |
781 | |
794 | case KW_per_player: thawer.get (per_player); break; |
782 | case KW_per_player: thawer.get (per_player); break; |
795 | case KW_per_party: thawer.get (per_party); break; |
783 | case KW_per_party: thawer.get (per_party); break; |
796 | |
784 | |
797 | case KW_region: get_region_by_name (thawer.get_str ()); break; |
785 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
798 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
786 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
799 | |
787 | |
800 | // old names new names |
788 | // old names new names |
801 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
789 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
802 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
790 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
… | |
… | |
810 | |
798 | |
811 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
799 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
812 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
800 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
813 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
801 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
814 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
802 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
|
|
803 | |
|
|
804 | case KW_end: |
|
|
805 | return true; |
|
|
806 | |
|
|
807 | default: |
|
|
808 | if (!thawer.parse_error (kw, "map", 0)) |
|
|
809 | return false; |
|
|
810 | break; |
815 | } |
811 | } |
816 | } |
812 | } |
817 | |
813 | |
818 | abort (); |
814 | abort (); |
819 | } |
815 | } |
… | |
… | |
871 | MAP_OUT (reset_time); |
867 | MAP_OUT (reset_time); |
872 | MAP_OUT (reset_timeout); |
868 | MAP_OUT (reset_timeout); |
873 | MAP_OUT (fixed_resettime); |
869 | MAP_OUT (fixed_resettime); |
874 | MAP_OUT (difficulty); |
870 | MAP_OUT (difficulty); |
875 | |
871 | |
876 | if (region) MAP_OUT2 (region, region->name); |
872 | if (default_region) MAP_OUT2 (region, default_region->name); |
877 | |
873 | |
878 | if (shopitems) |
874 | if (shopitems) |
879 | { |
875 | { |
880 | char shop[MAX_BUF]; |
876 | char shop[MAX_BUF]; |
881 | print_shop_string (this, shop); |
877 | print_shop_string (this, shop); |
… | |
… | |
932 | * Remove and free all objects in the given map. |
928 | * Remove and free all objects in the given map. |
933 | */ |
929 | */ |
934 | void |
930 | void |
935 | maptile::clear () |
931 | maptile::clear () |
936 | { |
932 | { |
|
|
933 | sfree (regions, size ()), regions = 0; |
|
|
934 | free (regionmap), regionmap = 0; |
|
|
935 | |
937 | if (!spaces) |
936 | if (spaces) |
938 | return; |
937 | { |
939 | |
|
|
940 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
938 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
941 | while (object *op = ms->bot) |
939 | while (object *op = ms->bot) |
942 | { |
940 | { |
943 | if (op->head) |
941 | if (op->head) |
944 | op = op->head; |
942 | op = op->head; |
945 | |
943 | |
946 | op->destroy_inv (false); |
944 | op->destroy_inv (false); |
947 | op->destroy (); |
945 | op->destroy (); |
948 | } |
946 | } |
949 | |
947 | |
950 | sfree (spaces, size ()), spaces = 0; |
948 | sfree (spaces, size ()), spaces = 0; |
|
|
949 | } |
951 | |
950 | |
952 | if (buttons) |
951 | if (buttons) |
953 | free_objectlinkpt (buttons), buttons = 0; |
952 | free_objectlinkpt (buttons), buttons = 0; |
954 | } |
953 | } |
955 | |
954 | |
… | |
… | |
1449 | |
1448 | |
1450 | /** |
1449 | /** |
1451 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1450 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1452 | * map1 to map2 in dx/dy. |
1451 | * map1 to map2 in dx/dy. |
1453 | */ |
1452 | */ |
1454 | static int |
1453 | int |
1455 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1454 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1456 | { |
1455 | { |
1457 | if (!map1 || !map2) |
1456 | if (!map1 || !map2) |
1458 | return 0; |
1457 | return 0; |
1459 | |
1458 | |
… | |
… | |
1631 | * flags has no meaning for this function at this time - I kept it in to |
1630 | * flags has no meaning for this function at this time - I kept it in to |
1632 | * be more consistant with the above function and also in case they are needed |
1631 | * be more consistant with the above function and also in case they are needed |
1633 | * for something in the future. Also, since no object is pasted, the best |
1632 | * for something in the future. Also, since no object is pasted, the best |
1634 | * field of the rv_vector is set to NULL. |
1633 | * field of the rv_vector is set to NULL. |
1635 | */ |
1634 | */ |
1636 | |
|
|
1637 | void |
1635 | void |
1638 | get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) |
1636 | get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) |
1639 | { |
1637 | { |
1640 | if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) |
1638 | if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) |
1641 | { |
1639 | { |
1642 | /* be conservative and fill in _some_ data */ |
1640 | /* be conservative and fill in _some_ data */ |
1643 | retval->distance = 100000; |
1641 | retval->distance = 100000; |
… | |
… | |
1680 | op->remove (); |
1678 | op->remove (); |
1681 | |
1679 | |
1682 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1680 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1683 | } |
1681 | } |
1684 | |
1682 | |
|
|
1683 | region * |
|
|
1684 | maptile::region (int x, int y) const |
|
|
1685 | { |
|
|
1686 | if (regions |
|
|
1687 | && regionmap |
|
|
1688 | && !OUT_OF_REAL_MAP (this, x, y)) |
|
|
1689 | if (struct region *reg = regionmap [regions [y * width + x]]) |
|
|
1690 | return reg; |
|
|
1691 | |
|
|
1692 | if (default_region) |
|
|
1693 | return default_region; |
|
|
1694 | |
|
|
1695 | return ::region::default_region (); |
|
|
1696 | } |
|
|
1697 | |