| … | |
… | |
| 792 | case KW_sky: thawer.get (sky); break; |
792 | case KW_sky: thawer.get (sky); break; |
| 793 | |
793 | |
| 794 | case KW_per_player: thawer.get (per_player); break; |
794 | case KW_per_player: thawer.get (per_player); break; |
| 795 | case KW_per_party: thawer.get (per_party); break; |
795 | case KW_per_party: thawer.get (per_party); break; |
| 796 | |
796 | |
| 797 | case KW_region: get_region_by_name (thawer.get_str ()); break; |
797 | case KW_region: default_region = get_region_by_name (thawer.get_str ()); break; |
| 798 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
798 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
| 799 | |
799 | |
| 800 | // old names new names |
800 | // old names new names |
| 801 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
801 | 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; |
802 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
| … | |
… | |
| 871 | MAP_OUT (reset_time); |
871 | MAP_OUT (reset_time); |
| 872 | MAP_OUT (reset_timeout); |
872 | MAP_OUT (reset_timeout); |
| 873 | MAP_OUT (fixed_resettime); |
873 | MAP_OUT (fixed_resettime); |
| 874 | MAP_OUT (difficulty); |
874 | MAP_OUT (difficulty); |
| 875 | |
875 | |
| 876 | if (region) MAP_OUT2 (region, region->name); |
876 | if (default_region) MAP_OUT2 (region, default_region->name); |
| 877 | |
877 | |
| 878 | if (shopitems) |
878 | if (shopitems) |
| 879 | { |
879 | { |
| 880 | char shop[MAX_BUF]; |
880 | char shop[MAX_BUF]; |
| 881 | print_shop_string (this, shop); |
881 | print_shop_string (this, shop); |
| … | |
… | |
| 1110 | void |
1110 | void |
| 1111 | mapspace::update_ () |
1111 | mapspace::update_ () |
| 1112 | { |
1112 | { |
| 1113 | object *tmp, *last = 0; |
1113 | object *tmp, *last = 0; |
| 1114 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1114 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
| 1115 | New_Face *top, *floor, *middle; |
1115 | facetile *top, *floor, *middle; |
| 1116 | object *top_obj, *floor_obj, *middle_obj; |
1116 | object *top_obj, *floor_obj, *middle_obj; |
| 1117 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1117 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
| 1118 | |
1118 | |
| 1119 | middle = blank_face; |
1119 | middle = blank_face; |
| 1120 | top = blank_face; |
1120 | top = blank_face; |
| … | |
… | |
| 1550 | /* From map.c |
1550 | /* From map.c |
| 1551 | * This is used by get_player to determine where the other |
1551 | * This is used by get_player to determine where the other |
| 1552 | * creature is. get_rangevector takes into account map tiling, |
1552 | * creature is. get_rangevector takes into account map tiling, |
| 1553 | * so you just can not look the the map coordinates and get the |
1553 | * so you just can not look the the map coordinates and get the |
| 1554 | * righte value. distance_x/y are distance away, which |
1554 | * righte value. distance_x/y are distance away, which |
| 1555 | * can be negativbe. direction is the crossfire direction scheme |
1555 | * can be negative. direction is the crossfire direction scheme |
| 1556 | * that the creature should head. part is the part of the |
1556 | * that the creature should head. part is the part of the |
| 1557 | * monster that is closest. |
1557 | * monster that is closest. |
| 1558 | * |
1558 | * |
| 1559 | * get_rangevector looks at op1 and op2, and fills in the |
1559 | * get_rangevector looks at op1 and op2, and fills in the |
| 1560 | * structure for op1 to get to op2. |
1560 | * structure for op1 to get to op2. |
