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.81 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.87 by root, Thu Feb 15 21:07:48 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.
… …
541 return false; 542 return false;
542 543
543 if (skip_header) 544 if (skip_header)
544 for (;;) 545 for (;;)
545 { 546 {
546 keyword kw = thawer.get_kv ();
547
548 if (kw == KW_end) 547 if (thawer.kw == KW_end)
549 break; 548 break;
550 549
551 thawer.skip_kv (kw); 550 thawer.skip_kv ();
552 } 551 }
553 552
554 return _load_objects (thawer); 553 return _load_objects (thawer);
555} 554}
556 555
… …
568maptile::maptile () 567maptile::maptile ()
569{ 568{
570 in_memory = MAP_SWAPPED; 569 in_memory = MAP_SWAPPED;
571 570
572 /* The maps used to pick up default x and y values from the 571 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 572 * map archetype. Mimic that behaviour.
574 */ 573 */
575 width = 16; 574 width = 16;
576 height = 16; 575 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 576 timeout = 300;
579 enter_x = 0; 577 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 578 max_volume = 2000000; // 2m³
581} 579}
582 580
583maptile::maptile (int w, int h) 581maptile::maptile (int w, int h)
584{ 582{
585 in_memory = MAP_SWAPPED; 583 in_memory = MAP_SWAPPED;
… …
739 { 737 {
740 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
741 739
742 switch (kw) 740 switch (kw)
743 { 741 {
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: 742 case KW_msg:
757 thawer.get_ml (KW_endmsg, msg); 743 thawer.get_ml (KW_endmsg, msg);
758 break; 744 break;
759 745
760 case KW_lore: // CF+ extension 746 case KW_lore: // CF+ extension
… …
810 796
811 case KW_tile_path_1: thawer.get (tile_path [0]); break; 797 case KW_tile_path_1: thawer.get (tile_path [0]); break;
812 case KW_tile_path_2: thawer.get (tile_path [1]); break; 798 case KW_tile_path_2: thawer.get (tile_path [1]); break;
813 case KW_tile_path_3: thawer.get (tile_path [2]); break; 799 case KW_tile_path_3: thawer.get (tile_path [2]); break;
814 case KW_tile_path_4: thawer.get (tile_path [3]); break; 800 case KW_tile_path_4: thawer.get (tile_path [3]); break;
801
802 case KW_end:
803 return true;
804
805 default:
806 if (!thawer.parse_error ("map", 0))
807 return false;
808 break;
815 } 809 }
816 } 810 }
817 811
818 abort (); 812 abort ();
819} 813}
… …
1280 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1274 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; 1275 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; 1276 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1283} 1277}
1284 1278
1279uint64
1280mapspace::volume () const
1281{
1282 uint64 vol = 0;
1283
1284 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1285 vol += op->volume ();
1286
1287 return vol;
1288}
1289
1285/* this updates the orig_map->tile_map[tile_num] value after finding 1290/* 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 1291 * 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 1292 * maps tile_map values if it tiles back to this one. It returns
1288 * the value of orig_map->tile_map[tile_num]. 1293 * the value of orig_map->tile_map[tile_num].
1289 */ 1294 */
… …
1452 1457
1453/** 1458/**
1454 * Return whether map2 is adjacent to map1. If so, store the distance from 1459 * Return whether map2 is adjacent to map1. If so, store the distance from
1455 * map1 to map2 in dx/dy. 1460 * map1 to map2 in dx/dy.
1456 */ 1461 */
1457static int 1462int
1458adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1463adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1459{ 1464{
1460 if (!map1 || !map2) 1465 if (!map1 || !map2)
1461 return 0; 1466 return 0;
1462 1467
… …
1574get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1579get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1575{ 1580{
1576 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1581 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1577 { 1582 {
1578 /* be conservative and fill in _some_ data */ 1583 /* be conservative and fill in _some_ data */
1579 retval->distance = 100000; 1584 retval->distance = 10000;
1580 retval->distance_x = 32767; 1585 retval->distance_x = 10000;
1581 retval->distance_y = 32767; 1586 retval->distance_y = 10000;
1582 retval->direction = 0; 1587 retval->direction = 0;
1583 retval->part = 0; 1588 retval->part = 0;
1584 } 1589 }
1585 else 1590 else
1586 { 1591 {
… …
1591 1596
1592 best = op1; 1597 best = op1;
1593 /* If this is multipart, find the closest part now */ 1598 /* If this is multipart, find the closest part now */
1594 if (!(flags & 0x1) && op1->more) 1599 if (!(flags & 0x1) && op1->more)
1595 { 1600 {
1596 object *tmp;
1597 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1601 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1598 1602
1599 /* we just take the offset of the piece to head to figure 1603 /* we just take the offset of the piece to head to figure
1600 * distance instead of doing all that work above again 1604 * distance instead of doing all that work above again
1601 * since the distance fields we set above are positive in the 1605 * since the distance fields we set above are positive in the
1602 * same axis as is used for multipart objects, the simply arithmetic 1606 * same axis as is used for multipart objects, the simply arithmetic
1603 * below works. 1607 * below works.
1604 */ 1608 */
1605 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1609 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1606 { 1610 {
1607 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1611 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); 1612 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1609 if (tmpi < best_distance) 1613 if (tmpi < best_distance)
1610 { 1614 {
… …
1619 retval->distance_y += op1->y - best->y; 1623 retval->distance_y += op1->y - best->y;
1620 } 1624 }
1621 } 1625 }
1622 1626
1623 retval->part = best; 1627 retval->part = best;
1624 retval->distance = idistance (retval->distance_x, retval->distance_y); 1628 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1629 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1626 } 1630 }
1627} 1631}
1628 1632
1629/* this is basically the same as get_rangevector above, but instead of 1633/* this is basically the same as get_rangevector above, but instead of
… …
1634 * flags has no meaning for this function at this time - I kept it in to 1638 * flags has no meaning for this function at this time - I kept it in to
1635 * be more consistant with the above function and also in case they are needed 1639 * be more consistant with the above function and also in case they are needed
1636 * for something in the future. Also, since no object is pasted, the best 1640 * for something in the future. Also, since no object is pasted, the best
1637 * field of the rv_vector is set to NULL. 1641 * field of the rv_vector is set to NULL.
1638 */ 1642 */
1639
1640void 1643void
1641get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1644get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1642{ 1645{
1643 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1646 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1644 { 1647 {
1645 /* be conservative and fill in _some_ data */ 1648 /* be conservative and fill in _some_ data */
1646 retval->distance = 100000; 1649 retval->distance = 100000;
… …
1698 return default_region; 1701 return default_region;
1699 1702
1700 return ::region::default_region (); 1703 return ::region::default_region ();
1701} 1704}
1702 1705
1706

Diff Legend

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