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.82 by root, Mon Jan 29 16:11:48 2007 UTC vs.
Revision 1.86 by root, Thu Feb 15 15:43:36 2007 UTC

… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
30 31
31#include "path.h" 32#include "path.h"
32 33
33/* 34/*
34 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
67 char *endbuf; 68 char *endbuf;
68 struct stat statbuf; 69 struct stat statbuf;
69 int mode = 0; 70 int mode = 0;
70 71
71 if (prepend_dir) 72 if (prepend_dir)
72 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
73 else 74 else
74 strcpy (buf, name); 75 assign (buf, name);
75 76
76 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
79 * all the names. 80 * all the names.
… …
568maptile::maptile () 569maptile::maptile ()
569{ 570{
570 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
571 572
572 /* The maps used to pick up default x and y values from the 573 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
574 */ 575 */
575 width = 16; 576 width = 16;
576 height = 16; 577 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 578 timeout = 300;
579 enter_x = 0; 579 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 580 max_volume = 2000000; // 2m³
581} 581}
582 582
583maptile::maptile (int w, int h) 583maptile::maptile (int w, int h)
584{ 584{
585 in_memory = MAP_SWAPPED; 585 in_memory = MAP_SWAPPED;
… …
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
… …
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}
… …
1280 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1281 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1282 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1283} 1279}
1284 1280
1281uint64
1282mapspace::volume () const
1283{
1284 uint64 vol = 0;
1285
1286 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1287 vol += op->volume ();
1288
1289 return vol;
1290}
1291
1285/* this updates the orig_map->tile_map[tile_num] value after finding 1292/* this updates the orig_map->tile_map[tile_num] value after finding
1286 * the map. It also takes care of linking back the freshly found 1293 * the map. It also takes care of linking back the freshly found
1287 * maps tile_map values if it tiles back to this one. It returns 1294 * maps tile_map values if it tiles back to this one. It returns
1288 * the value of orig_map->tile_map[tile_num]. 1295 * the value of orig_map->tile_map[tile_num].
1289 */ 1296 */
… …
1574get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1581get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1575{ 1582{
1576 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1583 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1577 { 1584 {
1578 /* be conservative and fill in _some_ data */ 1585 /* be conservative and fill in _some_ data */
1579 retval->distance = 100000; 1586 retval->distance = 10000;
1580 retval->distance_x = 32767; 1587 retval->distance_x = 10000;
1581 retval->distance_y = 32767; 1588 retval->distance_y = 10000;
1582 retval->direction = 0; 1589 retval->direction = 0;
1583 retval->part = 0; 1590 retval->part = 0;
1584 } 1591 }
1585 else 1592 else
1586 { 1593 {
… …
1591 1598
1592 best = op1; 1599 best = op1;
1593 /* If this is multipart, find the closest part now */ 1600 /* If this is multipart, find the closest part now */
1594 if (!(flags & 0x1) && op1->more) 1601 if (!(flags & 0x1) && op1->more)
1595 { 1602 {
1596 object *tmp;
1597 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1603 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1598 1604
1599 /* we just take the offset of the piece to head to figure 1605 /* we just take the offset of the piece to head to figure
1600 * distance instead of doing all that work above again 1606 * distance instead of doing all that work above again
1601 * since the distance fields we set above are positive in the 1607 * since the distance fields we set above are positive in the
1602 * same axis as is used for multipart objects, the simply arithmetic 1608 * same axis as is used for multipart objects, the simply arithmetic
1603 * below works. 1609 * below works.
1604 */ 1610 */
1605 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1611 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1606 { 1612 {
1607 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1613 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1608 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1614 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1609 if (tmpi < best_distance) 1615 if (tmpi < best_distance)
1610 { 1616 {
… …
1619 retval->distance_y += op1->y - best->y; 1625 retval->distance_y += op1->y - best->y;
1620 } 1626 }
1621 } 1627 }
1622 1628
1623 retval->part = best; 1629 retval->part = best;
1624 retval->distance = idistance (retval->distance_x, retval->distance_y); 1630 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1631 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626 } 1632 }
1627} 1633}
1628 1634
1629/* this is basically the same as get_rangevector above, but instead of 1635/* this is basically the same as get_rangevector above, but instead of
… …
1697 return default_region; 1703 return default_region;
1698 1704
1699 return ::region::default_region (); 1705 return ::region::default_region ();
1700} 1706}
1701 1707
1708

Diff Legend

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