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.73 by root, Sun Jan 14 18:00:33 2007 UTC vs.
Revision 1.87 by root, Thu Feb 15 21:07:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
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.
… …
228 229
229 } 230 }
230 return 0; 231 return 0;
231} 232}
232 233
233
234/* 234/*
235 * Returns true if the given object can't fit in the given spot. 235 * 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, 236 * This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
542 return false; 542 return false;
543 543
544 if (skip_header) 544 if (skip_header)
545 for (;;) 545 for (;;)
546 { 546 {
547 keyword kw = thawer.get_kv ();
548
549 if (kw == KW_end) 547 if (thawer.kw == KW_end)
550 break; 548 break;
551 549
552 thawer.skip_kv (kw); 550 thawer.skip_kv ();
553 } 551 }
554 552
555 return _load_objects (thawer); 553 return _load_objects (thawer);
556} 554}
557 555
… …
569maptile::maptile () 567maptile::maptile ()
570{ 568{
571 in_memory = MAP_SWAPPED; 569 in_memory = MAP_SWAPPED;
572 570
573 /* 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
574 * map archetype. Mimic that behaviour. 572 * map archetype. Mimic that behaviour.
575 */ 573 */
576 width = 16; 574 width = 16;
577 height = 16; 575 height = 16;
578 reset_timeout = 0;
579 timeout = 300; 576 timeout = 300;
580 enter_x = 0; 577 max_nrof = 1000; // 1000 items of anything
581 enter_y = 0; 578 max_volume = 2000000; // 2m³
582} 579}
583 580
584maptile::maptile (int w, int h) 581maptile::maptile (int w, int h)
585{ 582{
586 in_memory = MAP_SWAPPED; 583 in_memory = MAP_SWAPPED;
… …
740 { 737 {
741 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
742 739
743 switch (kw) 740 switch (kw)
744 { 741 {
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: 742 case KW_msg:
758 thawer.get_ml (KW_endmsg, msg); 743 thawer.get_ml (KW_endmsg, msg);
759 break; 744 break;
760 745
761 case KW_lore: // CF+ extension 746 case KW_lore: // CF+ extension
… …
793 case KW_sky: thawer.get (sky); break; 778 case KW_sky: thawer.get (sky); break;
794 779
795 case KW_per_player: thawer.get (per_player); break; 780 case KW_per_player: thawer.get (per_player); break;
796 case KW_per_party: thawer.get (per_party); break; 781 case KW_per_party: thawer.get (per_party); break;
797 782
798 case KW_region: get_region_by_name (thawer.get_str ()); break; 783 case KW_region: default_region = region::find (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800 785
801 // old names new names 786 // old names new names
802 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 787 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; 788 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
811 796
812 case KW_tile_path_1: thawer.get (tile_path [0]); break; 797 case KW_tile_path_1: thawer.get (tile_path [0]); break;
813 case KW_tile_path_2: thawer.get (tile_path [1]); break; 798 case KW_tile_path_2: thawer.get (tile_path [1]); break;
814 case KW_tile_path_3: thawer.get (tile_path [2]); break; 799 case KW_tile_path_3: thawer.get (tile_path [2]); break;
815 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;
816 } 809 }
817 } 810 }
818 811
819 abort (); 812 abort ();
820} 813}
… …
872 MAP_OUT (reset_time); 865 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 866 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 867 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty); 868 MAP_OUT (difficulty);
876 869
877 if (region) MAP_OUT2 (region, region->name); 870 if (default_region) MAP_OUT2 (region, default_region->name);
878 871
879 if (shopitems) 872 if (shopitems)
880 { 873 {
881 char shop[MAX_BUF]; 874 char shop[MAX_BUF];
882 print_shop_string (this, shop); 875 print_shop_string (this, shop);
… …
933 * Remove and free all objects in the given map. 926 * Remove and free all objects in the given map.
934 */ 927 */
935void 928void
936maptile::clear () 929maptile::clear ()
937{ 930{
931 sfree (regions, size ()), regions = 0;
932 free (regionmap), regionmap = 0;
933
938 if (!spaces) 934 if (spaces)
939 return; 935 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 937 while (object *op = ms->bot)
943 { 938 {
944 if (op->head) 939 if (op->head)
945 op = op->head; 940 op = op->head;
946 941
947 op->destroy_inv (false); 942 op->destroy_inv (false);
948 op->destroy (); 943 op->destroy ();
949 } 944 }
950 945
951 sfree (spaces, size ()), spaces = 0; 946 sfree (spaces, size ()), spaces = 0;
947 }
952 948
953 if (buttons) 949 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 950 free_objectlinkpt (buttons), buttons = 0;
955} 951}
956 952
… …
1110 */ 1106 */
1111void 1107void
1112mapspace::update_ () 1108mapspace::update_ ()
1113{ 1109{
1114 object *tmp, *last = 0; 1110 object *tmp, *last = 0;
1115 uint8 flags = 0, light = 0, anywhere = 0; 1111 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1112 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1113 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1114 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1115
1120 middle = blank_face; 1116 middle = blank_face;
1121 top = blank_face; 1117 top = blank_face;
… …
1278 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;
1279 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;
1280 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;
1281} 1277}
1282 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
1283/* 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
1284 * 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
1285 * 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
1286 * the value of orig_map->tile_map[tile_num]. 1293 * the value of orig_map->tile_map[tile_num].
1287 */ 1294 */
… …
1450 1457
1451/** 1458/**
1452 * 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
1453 * map1 to map2 in dx/dy. 1460 * map1 to map2 in dx/dy.
1454 */ 1461 */
1455static int 1462int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1463adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1464{
1458 if (!map1 || !map2) 1465 if (!map1 || !map2)
1459 return 0; 1466 return 0;
1460 1467
… …
1551/* From map.c 1558/* From map.c
1552 * This is used by get_player to determine where the other 1559 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1560 * creature is. get_rangevector takes into account map tiling,
1554 * so you just can not look the the map coordinates and get the 1561 * so you just can not look the the map coordinates and get the
1555 * righte value. distance_x/y are distance away, which 1562 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1563 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1564 * that the creature should head. part is the part of the
1558 * monster that is closest. 1565 * monster that is closest.
1559 * 1566 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1567 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1568 * structure for op1 to get to op2.
… …
1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1579get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1573{ 1580{
1574 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))
1575 { 1582 {
1576 /* be conservative and fill in _some_ data */ 1583 /* be conservative and fill in _some_ data */
1577 retval->distance = 100000; 1584 retval->distance = 10000;
1578 retval->distance_x = 32767; 1585 retval->distance_x = 10000;
1579 retval->distance_y = 32767; 1586 retval->distance_y = 10000;
1580 retval->direction = 0; 1587 retval->direction = 0;
1581 retval->part = 0; 1588 retval->part = 0;
1582 } 1589 }
1583 else 1590 else
1584 { 1591 {
… …
1589 1596
1590 best = op1; 1597 best = op1;
1591 /* If this is multipart, find the closest part now */ 1598 /* If this is multipart, find the closest part now */
1592 if (!(flags & 0x1) && op1->more) 1599 if (!(flags & 0x1) && op1->more)
1593 { 1600 {
1594 object *tmp;
1595 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;
1596 1602
1597 /* 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
1598 * distance instead of doing all that work above again 1604 * distance instead of doing all that work above again
1599 * since the distance fields we set above are positive in the 1605 * since the distance fields we set above are positive in the
1600 * same axis as is used for multipart objects, the simply arithmetic 1606 * same axis as is used for multipart objects, the simply arithmetic
1601 * below works. 1607 * below works.
1602 */ 1608 */
1603 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1609 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604 { 1610 {
1605 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) +
1606 (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);
1607 if (tmpi < best_distance) 1613 if (tmpi < best_distance)
1608 { 1614 {
1609 best_distance = tmpi; 1615 best_distance = tmpi;
1610 best = tmp; 1616 best = tmp;
1611 } 1617 }
1612 } 1618 }
1619
1613 if (best != op1) 1620 if (best != op1)
1614 { 1621 {
1615 retval->distance_x += op1->x - best->x; 1622 retval->distance_x += op1->x - best->x;
1616 retval->distance_y += op1->y - best->y; 1623 retval->distance_y += op1->y - best->y;
1617 } 1624 }
1618 } 1625 }
1626
1619 retval->part = best; 1627 retval->part = best;
1620 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1628 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1629 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1630 }
1623} 1631}
1624 1632
1625/* 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
… …
1630 * 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
1631 * 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
1632 * 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
1633 * field of the rv_vector is set to NULL. 1641 * field of the rv_vector is set to NULL.
1634 */ 1642 */
1635
1636void 1643void
1637get_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)
1638{ 1645{
1639 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))
1640 { 1647 {
1641 /* be conservative and fill in _some_ data */ 1648 /* be conservative and fill in _some_ data */
1642 retval->distance = 100000; 1649 retval->distance = 100000;
… …
1649 { 1656 {
1650 retval->distance_x += op2->x - x; 1657 retval->distance_x += op2->x - x;
1651 retval->distance_y += op2->y - y; 1658 retval->distance_y += op2->y - y;
1652 1659
1653 retval->part = NULL; 1660 retval->part = NULL;
1654 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1661 retval->distance = idistance (retval->distance_x, retval->distance_y);
1655 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1662 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656 } 1663 }
1657} 1664}
1658 1665
1659/* Returns true of op1 and op2 are effectively on the same map 1666/* Returns true of op1 and op2 are effectively on the same map
… …
1679 op->remove (); 1686 op->remove ();
1680 1687
1681 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1688 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1682} 1689}
1683 1690
1691region *
1692maptile::region (int x, int y) const
1693{
1694 if (regions
1695 && regionmap
1696 && !OUT_OF_REAL_MAP (this, x, y))
1697 if (struct region *reg = regionmap [regions [y * width + x]])
1698 return reg;
1699
1700 if (default_region)
1701 return default_region;
1702
1703 return ::region::default_region ();
1704}
1705
1706

Diff Legend

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