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.84 by root, Mon Feb 5 01:24:45 2007 UTC

… …
67 char *endbuf; 67 char *endbuf;
68 struct stat statbuf; 68 struct stat statbuf;
69 int mode = 0; 69 int mode = 0;
70 70
71 if (prepend_dir) 71 if (prepend_dir)
72 strcpy (buf, create_pathname (name)); 72 assign (buf, create_pathname (name));
73 else 73 else
74 strcpy (buf, name); 74 assign (buf, name);
75 75
76 /* old method (strchr(buf, '\0')) seemd very odd to me - 76 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer. 77 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through 78 * Can not use strcat because we need to cycle through
79 * all the names. 79 * all the names.
… …
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
… …
740 { 739 {
741 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
742 741
743 switch (kw) 742 switch (kw)
744 { 743 {
745 case KW_EOF:
746 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
747 return false;
748
749 case KW_end:
750 return true;
751
752 default:
753 case KW_ERROR:
754 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
755 break;
756
757 case KW_msg: 744 case KW_msg:
758 thawer.get_ml (KW_endmsg, msg); 745 thawer.get_ml (KW_endmsg, msg);
759 break; 746 break;
760 747
761 case KW_lore: // CF+ extension 748 case KW_lore: // CF+ extension
… …
793 case KW_sky: thawer.get (sky); break; 780 case KW_sky: thawer.get (sky); break;
794 781
795 case KW_per_player: thawer.get (per_player); break; 782 case KW_per_player: thawer.get (per_player); break;
796 case KW_per_party: thawer.get (per_party); break; 783 case KW_per_party: thawer.get (per_party); break;
797 784
798 case KW_region: get_region_by_name (thawer.get_str ()); break; 785 case KW_region: default_region = region::find (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800 787
801 // old names new names 788 // old names new names
802 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;
803 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;
… …
811 798
812 case KW_tile_path_1: thawer.get (tile_path [0]); break; 799 case KW_tile_path_1: thawer.get (tile_path [0]); break;
813 case KW_tile_path_2: thawer.get (tile_path [1]); break; 800 case KW_tile_path_2: thawer.get (tile_path [1]); break;
814 case KW_tile_path_3: thawer.get (tile_path [2]); break; 801 case KW_tile_path_3: thawer.get (tile_path [2]); break;
815 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;
816 } 811 }
817 } 812 }
818 813
819 abort (); 814 abort ();
820} 815}
… …
872 MAP_OUT (reset_time); 867 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 868 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 869 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty); 870 MAP_OUT (difficulty);
876 871
877 if (region) MAP_OUT2 (region, region->name); 872 if (default_region) MAP_OUT2 (region, default_region->name);
878 873
879 if (shopitems) 874 if (shopitems)
880 { 875 {
881 char shop[MAX_BUF]; 876 char shop[MAX_BUF];
882 print_shop_string (this, shop); 877 print_shop_string (this, shop);
… …
933 * Remove and free all objects in the given map. 928 * Remove and free all objects in the given map.
934 */ 929 */
935void 930void
936maptile::clear () 931maptile::clear ()
937{ 932{
933 sfree (regions, size ()), regions = 0;
934 free (regionmap), regionmap = 0;
935
938 if (!spaces) 936 if (spaces)
939 return; 937 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 938 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 939 while (object *op = ms->bot)
943 { 940 {
944 if (op->head) 941 if (op->head)
945 op = op->head; 942 op = op->head;
946 943
947 op->destroy_inv (false); 944 op->destroy_inv (false);
948 op->destroy (); 945 op->destroy ();
949 } 946 }
950 947
951 sfree (spaces, size ()), spaces = 0; 948 sfree (spaces, size ()), spaces = 0;
949 }
952 950
953 if (buttons) 951 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 952 free_objectlinkpt (buttons), buttons = 0;
955} 953}
956 954
… …
1111void 1109void
1112mapspace::update_ () 1110mapspace::update_ ()
1113{ 1111{
1114 object *tmp, *last = 0; 1112 object *tmp, *last = 0;
1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1114 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1115 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1117
1120 middle = blank_face; 1118 middle = blank_face;
1121 top = blank_face; 1119 top = blank_face;
… …
1450 1448
1451/** 1449/**
1452 * 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
1453 * map1 to map2 in dx/dy. 1451 * map1 to map2 in dx/dy.
1454 */ 1452 */
1455static int 1453int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1455{
1458 if (!map1 || !map2) 1456 if (!map1 || !map2)
1459 return 0; 1457 return 0;
1460 1458
… …
1551/* From map.c 1549/* From map.c
1552 * This is used by get_player to determine where the other 1550 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1551 * creature is. get_rangevector takes into account map tiling,
1554 * so you just can not look the the map coordinates and get the 1552 * so you just can not look the the map coordinates and get the
1555 * righte value. distance_x/y are distance away, which 1553 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1554 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1555 * that the creature should head. part is the part of the
1558 * monster that is closest. 1556 * monster that is closest.
1559 * 1557 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1558 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1559 * structure for op1 to get to op2.
… …
1632 * 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
1633 * 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
1634 * 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
1635 * field of the rv_vector is set to NULL. 1633 * field of the rv_vector is set to NULL.
1636 */ 1634 */
1637
1638void 1635void
1639get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1636get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1640{ 1637{
1641 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))
1642 { 1639 {
1643 /* be conservative and fill in _some_ data */ 1640 /* be conservative and fill in _some_ data */
1644 retval->distance = 100000; 1641 retval->distance = 100000;
… …
1681 op->remove (); 1678 op->remove ();
1682 1679
1683 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);
1684} 1681}
1685 1682
1683region *
1684maptile::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

Diff Legend

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