ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.82 by root, Mon Jan 29 16:11:48 2007 UTC

… …
228 228
229 } 229 }
230 return 0; 230 return 0;
231} 231}
232 232
233
234/* 233/*
235 * Returns true if the given object can't fit in the given spot. 234 * Returns true if the given object can't fit in the given spot.
236 * This is meant for multi space objects - for single space objecs, 235 * This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 236 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 237 * of object. This function goes through all the parts of the
… …
793 case KW_sky: thawer.get (sky); break; 792 case KW_sky: thawer.get (sky); break;
794 793
795 case KW_per_player: thawer.get (per_player); break; 794 case KW_per_player: thawer.get (per_player); break;
796 case KW_per_party: thawer.get (per_party); break; 795 case KW_per_party: thawer.get (per_party); break;
797 796
798 case KW_region: get_region_by_name (thawer.get_str ()); break; 797 case KW_region: default_region = region::find (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800 799
801 // old names new names 800 // old names new names
802 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;
803 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;
… …
872 MAP_OUT (reset_time); 871 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 872 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 873 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty); 874 MAP_OUT (difficulty);
876 875
877 if (region) MAP_OUT2 (region, region->name); 876 if (default_region) MAP_OUT2 (region, default_region->name);
878 877
879 if (shopitems) 878 if (shopitems)
880 { 879 {
881 char shop[MAX_BUF]; 880 char shop[MAX_BUF];
882 print_shop_string (this, shop); 881 print_shop_string (this, shop);
… …
933 * Remove and free all objects in the given map. 932 * Remove and free all objects in the given map.
934 */ 933 */
935void 934void
936maptile::clear () 935maptile::clear ()
937{ 936{
937 sfree (regions, size ()), regions = 0;
938 free (regionmap), regionmap = 0;
939
938 if (!spaces) 940 if (spaces)
939 return; 941 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 942 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 943 while (object *op = ms->bot)
943 { 944 {
944 if (op->head) 945 if (op->head)
945 op = op->head; 946 op = op->head;
946 947
947 op->destroy_inv (false); 948 op->destroy_inv (false);
948 op->destroy (); 949 op->destroy ();
949 } 950 }
950 951
951 sfree (spaces, size ()), spaces = 0; 952 sfree (spaces, size ()), spaces = 0;
953 }
952 954
953 if (buttons) 955 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 956 free_objectlinkpt (buttons), buttons = 0;
955} 957}
956 958
… …
1111void 1113void
1112mapspace::update_ () 1114mapspace::update_ ()
1113{ 1115{
1114 object *tmp, *last = 0; 1116 object *tmp, *last = 0;
1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1117 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1118 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1119 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1120 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1121
1120 middle = blank_face; 1122 middle = blank_face;
1121 top = blank_face; 1123 top = blank_face;
… …
1450 1452
1451/** 1453/**
1452 * Return whether map2 is adjacent to map1. If so, store the distance from 1454 * Return whether map2 is adjacent to map1. If so, store the distance from
1453 * map1 to map2 in dx/dy. 1455 * map1 to map2 in dx/dy.
1454 */ 1456 */
1455static int 1457int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1458adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1459{
1458 if (!map1 || !map2) 1460 if (!map1 || !map2)
1459 return 0; 1461 return 0;
1460 1462
… …
1551/* From map.c 1553/* From map.c
1552 * This is used by get_player to determine where the other 1554 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1555 * creature is. get_rangevector takes into account map tiling,
1554 * so you just can not look the the map coordinates and get the 1556 * so you just can not look the the map coordinates and get the
1555 * righte value. distance_x/y are distance away, which 1557 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1558 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1559 * that the creature should head. part is the part of the
1558 * monster that is closest. 1560 * monster that is closest.
1559 * 1561 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1562 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1563 * structure for op1 to get to op2.
… …
1632 * flags has no meaning for this function at this time - I kept it in to 1634 * flags has no meaning for this function at this time - I kept it in to
1633 * be more consistant with the above function and also in case they are needed 1635 * be more consistant with the above function and also in case they are needed
1634 * for something in the future. Also, since no object is pasted, the best 1636 * for something in the future. Also, since no object is pasted, the best
1635 * field of the rv_vector is set to NULL. 1637 * field of the rv_vector is set to NULL.
1636 */ 1638 */
1637
1638void 1639void
1639get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1640get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1640{ 1641{
1641 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1642 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1642 { 1643 {
1643 /* be conservative and fill in _some_ data */ 1644 /* be conservative and fill in _some_ data */
1644 retval->distance = 100000; 1645 retval->distance = 100000;
… …
1681 op->remove (); 1682 op->remove ();
1682 1683
1683 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1684 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1684} 1685}
1685 1686
1687region *
1688maptile::region (int x, int y) const
1689{
1690 if (regions
1691 && regionmap
1692 && !OUT_OF_REAL_MAP (this, x, y))
1693 if (struct region *reg = regionmap [regions [y * width + x]])
1694 return reg;
1695
1696 if (default_region)
1697 return default_region;
1698
1699 return ::region::default_region ();
1700}
1701

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines