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.70 by root, Thu Jan 4 20:29:45 2007 UTC vs.
Revision 1.85 by root, Wed Feb 7 23:50:01 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) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 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>
22*/ 23 */
23 24
24#include <global.h>
25#include <funcpoint.h>
26
27#include <loader.h>
28#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
29 31
30#include "path.h" 32#include "path.h"
31 33
32/* 34/*
33 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
66 char *endbuf; 68 char *endbuf;
67 struct stat statbuf; 69 struct stat statbuf;
68 int mode = 0; 70 int mode = 0;
69 71
70 if (prepend_dir) 72 if (prepend_dir)
71 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
72 else 74 else
73 strcpy (buf, name); 75 assign (buf, name);
74 76
75 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
76 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
77 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
78 * all the names. 80 * all the names.
… …
227 229
228 } 230 }
229 return 0; 231 return 0;
230} 232}
231 233
232
233/* 234/*
234 * 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.
235 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
399 * Loads (ands parses) the objects into a given map from the specified 400 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 401 * file pointer.
401 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
402 */ 403 */
403bool 404bool
404maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
405{ 406{
406 int unique; 407 int unique;
407 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
408 409
409 op = object::create (); 410 op = object::create ();
… …
485 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 487 op->deactivate_recursive ();
487} 488}
488 489
489bool 490bool
490maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
491{ 492{
492 static int cede_count = 0; 493 static int cede_count = 0;
493 494
494 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
495 save_header (freezer); 496 _save_header (freezer);
496 497
497 if (!spaces) 498 if (!spaces)
498 return false; 499 return false;
499 500
500 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
501 { 502 {
503#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
502 if (cede_count >= 500) 504 if (cede_count >= 500)
503 { 505 {
504 cede_count = 0; 506 cede_count = 0;
505 coroapi::cede (); 507 coroapi::cede ();
506 } 508 }
509#endif
507 510
508 int unique = 0; 511 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 512 for (object *op = spaces [i].bot; op; op = op->above)
510 { 513 {
511 // count per-object, but cede only when modification-safe 514 // count per-object, but cede only when modification-safe
… …
529 532
530 return true; 533 return true;
531} 534}
532 535
533bool 536bool
534maptile::load_objects (const char *path, bool skip_header) 537maptile::_load_objects (const char *path, bool skip_header)
535{ 538{
536 object_thawer thawer (path); 539 object_thawer thawer (path);
537 540
538 if (!thawer) 541 if (!thawer)
539 return false; 542 return false;
… …
547 break; 550 break;
548 551
549 thawer.skip_kv (kw); 552 thawer.skip_kv (kw);
550 } 553 }
551 554
552 return load_objects (thawer); 555 return _load_objects (thawer);
553} 556}
554 557
555bool 558bool
556maptile::save_objects (const char *path, int flags) 559maptile::_save_objects (const char *path, int flags)
557{ 560{
558 object_freezer freezer; 561 object_freezer freezer;
559 562
560 if (!save_objects (freezer, flags)) 563 if (!_save_objects (freezer, flags))
561 return false; 564 return false;
562 565
563 return freezer.save (path); 566 return freezer.save (path);
564} 567}
565 568
566maptile::maptile () 569maptile::maptile ()
567{ 570{
568 in_memory = MAP_SWAPPED; 571 in_memory = MAP_SWAPPED;
569 572
570 /* 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
571 * map archetype. Mimic that behaviour. 574 * map archetype. Mimic that behaviour.
572 */ 575 */
573 width = 16; 576 width = 16;
574 height = 16; 577 height = 16;
575 reset_timeout = 0;
576 timeout = 300; 578 timeout = 300;
577 enter_x = 0; 579 max_nrof = 1000; // 1000 items of anything
578 enter_y = 0; 580 max_volume = 2000000; // 2m³
579} 581}
580 582
581maptile::maptile (int w, int h) 583maptile::maptile (int w, int h)
582{ 584{
583 in_memory = MAP_SWAPPED; 585 in_memory = MAP_SWAPPED;
… …
729 * This could be done in lex (like the object loader), but I think 731 * This could be done in lex (like the object loader), but I think
730 * currently, there are few enough fields this is not a big deal. 732 * currently, there are few enough fields this is not a big deal.
731 * MSW 2001-07-01 733 * MSW 2001-07-01
732 */ 734 */
733bool 735bool
734maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
735{ 737{
736 for (;;) 738 for (;;)
737 { 739 {
738 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
739 741
740 switch (kw) 742 switch (kw)
741 { 743 {
742 case KW_EOF:
743 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
744 return false;
745
746 case KW_end:
747 return true;
748
749 default:
750 case KW_ERROR:
751 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
752 break;
753
754 case KW_msg: 744 case KW_msg:
755 thawer.get_ml (KW_endmsg, msg); 745 thawer.get_ml (KW_endmsg, msg);
756 break; 746 break;
757 747
758 case KW_lore: // CF+ extension 748 case KW_lore: // CF+ extension
… …
790 case KW_sky: thawer.get (sky); break; 780 case KW_sky: thawer.get (sky); break;
791 781
792 case KW_per_player: thawer.get (per_player); break; 782 case KW_per_player: thawer.get (per_player); break;
793 case KW_per_party: thawer.get (per_party); break; 783 case KW_per_party: thawer.get (per_party); break;
794 784
795 case KW_region: get_region_by_name (thawer.get_str ()); break; 785 case KW_region: default_region = region::find (thawer.get_str ()); break;
796 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
797 787
798 // old names new names 788 // old names new names
799 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;
800 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;
… …
808 798
809 case KW_tile_path_1: thawer.get (tile_path [0]); break; 799 case KW_tile_path_1: thawer.get (tile_path [0]); break;
810 case KW_tile_path_2: thawer.get (tile_path [1]); break; 800 case KW_tile_path_2: thawer.get (tile_path [1]); break;
811 case KW_tile_path_3: thawer.get (tile_path [2]); break; 801 case KW_tile_path_3: thawer.get (tile_path [2]); break;
812 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;
813 } 811 }
814 } 812 }
815 813
816 abort (); 814 abort ();
817} 815}
818 816
819bool 817bool
820maptile::load_header (const char *path) 818maptile::_load_header (const char *path)
821{ 819{
822 object_thawer thawer (path); 820 object_thawer thawer (path);
823 821
824 if (!thawer) 822 if (!thawer)
825 return false; 823 return false;
826 824
827 return load_header (thawer); 825 return _load_header (thawer);
828} 826}
829 827
830/****************************************************************************** 828/******************************************************************************
831 * This is the start of unique map handling code 829 * This is the start of unique map handling code
832 *****************************************************************************/ 830 *****************************************************************************/
… …
855 } 853 }
856 } 854 }
857} 855}
858 856
859bool 857bool
860maptile::save_header (object_freezer &freezer) 858maptile::_save_header (object_freezer &freezer)
861{ 859{
862#define MAP_OUT(k) freezer.put (KW_ ## k, k) 860#define MAP_OUT(k) freezer.put (KW_ ## k, k)
863#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 861#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
864 862
865 MAP_OUT2 (arch, "map"); 863 MAP_OUT2 (arch, "map");
… …
869 MAP_OUT (reset_time); 867 MAP_OUT (reset_time);
870 MAP_OUT (reset_timeout); 868 MAP_OUT (reset_timeout);
871 MAP_OUT (fixed_resettime); 869 MAP_OUT (fixed_resettime);
872 MAP_OUT (difficulty); 870 MAP_OUT (difficulty);
873 871
874 if (region) MAP_OUT2 (region, region->name); 872 if (default_region) MAP_OUT2 (region, default_region->name);
875 873
876 if (shopitems) 874 if (shopitems)
877 { 875 {
878 char shop[MAX_BUF]; 876 char shop[MAX_BUF];
879 print_shop_string (this, shop); 877 print_shop_string (this, shop);
… …
914 912
915 return true; 913 return true;
916} 914}
917 915
918bool 916bool
919maptile::save_header (const char *path) 917maptile::_save_header (const char *path)
920{ 918{
921 object_freezer freezer; 919 object_freezer freezer;
922 920
923 if (!save_header (freezer)) 921 if (!_save_header (freezer))
924 return false; 922 return false;
925 923
926 return freezer.save (path); 924 return freezer.save (path);
927} 925}
928 926
… …
930 * Remove and free all objects in the given map. 928 * Remove and free all objects in the given map.
931 */ 929 */
932void 930void
933maptile::clear () 931maptile::clear ()
934{ 932{
933 sfree (regions, size ()), regions = 0;
934 free (regionmap), regionmap = 0;
935
935 if (!spaces) 936 if (spaces)
936 return; 937 {
937
938 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 938 for (mapspace *ms = spaces + size (); ms-- > spaces; )
939 while (object *op = ms->bot) 939 while (object *op = ms->bot)
940 { 940 {
941 if (op->head) 941 if (op->head)
942 op = op->head; 942 op = op->head;
943 943
944 op->destroy_inv (false); 944 op->destroy_inv (false);
945 op->destroy (); 945 op->destroy ();
946 } 946 }
947 947
948 sfree (spaces, size ()), spaces = 0; 948 sfree (spaces, size ()), spaces = 0;
949 }
949 950
950 if (buttons) 951 if (buttons)
951 free_objectlinkpt (buttons), buttons = 0; 952 free_objectlinkpt (buttons), buttons = 0;
952} 953}
953 954
… …
1107 */ 1108 */
1108void 1109void
1109mapspace::update_ () 1110mapspace::update_ ()
1110{ 1111{
1111 object *tmp, *last = 0; 1112 object *tmp, *last = 0;
1112 uint8 flags = 0, light = 0, anywhere = 0; 1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1113 New_Face *top, *floor, *middle; 1114 facetile *top, *floor, *middle;
1114 object *top_obj, *floor_obj, *middle_obj; 1115 object *top_obj, *floor_obj, *middle_obj;
1115 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;
1116 1117
1117 middle = blank_face; 1118 middle = blank_face;
1118 top = blank_face; 1119 top = blank_face;
… …
1275 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;
1276 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;
1277 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;
1278} 1279}
1279 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
1280/* 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
1281 * 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
1282 * 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
1283 * the value of orig_map->tile_map[tile_num]. 1295 * the value of orig_map->tile_map[tile_num].
1284 */ 1296 */
… …
1447 1459
1448/** 1460/**
1449 * Return whether map2 is adjacent to map1. If so, store the distance from 1461 * Return whether map2 is adjacent to map1. If so, store the distance from
1450 * map1 to map2 in dx/dy. 1462 * map1 to map2 in dx/dy.
1451 */ 1463 */
1452static int 1464int
1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1465adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1454{ 1466{
1455 if (!map1 || !map2) 1467 if (!map1 || !map2)
1456 return 0; 1468 return 0;
1457 1469
… …
1548/* From map.c 1560/* From map.c
1549 * This is used by get_player to determine where the other 1561 * This is used by get_player to determine where the other
1550 * creature is. get_rangevector takes into account map tiling, 1562 * creature is. get_rangevector takes into account map tiling,
1551 * so you just can not look the the map coordinates and get the 1563 * so you just can not look the the map coordinates and get the
1552 * righte value. distance_x/y are distance away, which 1564 * righte value. distance_x/y are distance away, which
1553 * can be negativbe. direction is the crossfire direction scheme 1565 * can be negative. direction is the crossfire direction scheme
1554 * that the creature should head. part is the part of the 1566 * that the creature should head. part is the part of the
1555 * monster that is closest. 1567 * monster that is closest.
1556 * 1568 *
1557 * get_rangevector looks at op1 and op2, and fills in the 1569 * get_rangevector looks at op1 and op2, and fills in the
1558 * structure for op1 to get to op2. 1570 * structure for op1 to get to op2.
… …
1605 { 1617 {
1606 best_distance = tmpi; 1618 best_distance = tmpi;
1607 best = tmp; 1619 best = tmp;
1608 } 1620 }
1609 } 1621 }
1622
1610 if (best != op1) 1623 if (best != op1)
1611 { 1624 {
1612 retval->distance_x += op1->x - best->x; 1625 retval->distance_x += op1->x - best->x;
1613 retval->distance_y += op1->y - best->y; 1626 retval->distance_y += op1->y - best->y;
1614 } 1627 }
1615 } 1628 }
1629
1616 retval->part = best; 1630 retval->part = best;
1617 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1631 retval->distance = idistance (retval->distance_x, retval->distance_y);
1618 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1632 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1619 } 1633 }
1620} 1634}
1621 1635
1622/* this is basically the same as get_rangevector above, but instead of 1636/* this is basically the same as get_rangevector above, but instead of
… …
1627 * flags has no meaning for this function at this time - I kept it in to 1641 * flags has no meaning for this function at this time - I kept it in to
1628 * be more consistant with the above function and also in case they are needed 1642 * be more consistant with the above function and also in case they are needed
1629 * for something in the future. Also, since no object is pasted, the best 1643 * for something in the future. Also, since no object is pasted, the best
1630 * field of the rv_vector is set to NULL. 1644 * field of the rv_vector is set to NULL.
1631 */ 1645 */
1632
1633void 1646void
1634get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1647get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1635{ 1648{
1636 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1649 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1637 { 1650 {
1638 /* be conservative and fill in _some_ data */ 1651 /* be conservative and fill in _some_ data */
1639 retval->distance = 100000; 1652 retval->distance = 100000;
… …
1646 { 1659 {
1647 retval->distance_x += op2->x - x; 1660 retval->distance_x += op2->x - x;
1648 retval->distance_y += op2->y - y; 1661 retval->distance_y += op2->y - y;
1649 1662
1650 retval->part = NULL; 1663 retval->part = NULL;
1651 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1664 retval->distance = idistance (retval->distance_x, retval->distance_y);
1652 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1665 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1653 } 1666 }
1654} 1667}
1655 1668
1656/* Returns true of op1 and op2 are effectively on the same map 1669/* Returns true of op1 and op2 are effectively on the same map
… …
1676 op->remove (); 1689 op->remove ();
1677 1690
1678 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1691 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1679} 1692}
1680 1693
1694region *
1695maptile::region (int x, int y) const
1696{
1697 if (regions
1698 && regionmap
1699 && !OUT_OF_REAL_MAP (this, x, y))
1700 if (struct region *reg = regionmap [regions [y * width + x]])
1701 return reg;
1702
1703 if (default_region)
1704 return default_region;
1705
1706 return ::region::default_region ();
1707}
1708
1709

Diff Legend

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