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.71 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.82 by root, Mon Jan 29 16:11: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> 25#include <global.h>
26#include <funcpoint.h> 26#include <funcpoint.h>
27 27
28#include <loader.h> 28#include <loader.h>
… …
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
… …
400 * Loads (ands parses) the objects into a given map from the specified 399 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 400 * file pointer.
402 * mapflags is the same as we get with load_original_map 401 * mapflags is the same as we get with load_original_map
403 */ 402 */
404bool 403bool
405maptile::load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &thawer)
406{ 405{
407 int unique; 406 int unique;
408 object *op, *prev = NULL, *last_more = NULL, *otmp; 407 object *op, *prev = NULL, *last_more = NULL, *otmp;
409 408
410 op = object::create (); 409 op = object::create ();
… …
486 for (object *op = ms->bot; op; op = op->above) 485 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 486 op->deactivate_recursive ();
488} 487}
489 488
490bool 489bool
491maptile::save_objects (object_freezer &freezer, int flags) 490maptile::_save_objects (object_freezer &freezer, int flags)
492{ 491{
493 static int cede_count = 0; 492 static int cede_count = 0;
494 493
495 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
496 save_header (freezer); 495 _save_header (freezer);
497 496
498 if (!spaces) 497 if (!spaces)
499 return false; 498 return false;
500 499
501 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
502 { 501 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500) 503 if (cede_count >= 500)
504 { 504 {
505 cede_count = 0; 505 cede_count = 0;
506 coroapi::cede (); 506 coroapi::cede ();
507 } 507 }
508#endif
508 509
509 int unique = 0; 510 int unique = 0;
510 for (object *op = spaces [i].bot; op; op = op->above) 511 for (object *op = spaces [i].bot; op; op = op->above)
511 { 512 {
512 // count per-object, but cede only when modification-safe 513 // count per-object, but cede only when modification-safe
… …
530 531
531 return true; 532 return true;
532} 533}
533 534
534bool 535bool
535maptile::load_objects (const char *path, bool skip_header) 536maptile::_load_objects (const char *path, bool skip_header)
536{ 537{
537 object_thawer thawer (path); 538 object_thawer thawer (path);
538 539
539 if (!thawer) 540 if (!thawer)
540 return false; 541 return false;
… …
548 break; 549 break;
549 550
550 thawer.skip_kv (kw); 551 thawer.skip_kv (kw);
551 } 552 }
552 553
553 return load_objects (thawer); 554 return _load_objects (thawer);
554} 555}
555 556
556bool 557bool
557maptile::save_objects (const char *path, int flags) 558maptile::_save_objects (const char *path, int flags)
558{ 559{
559 object_freezer freezer; 560 object_freezer freezer;
560 561
561 if (!save_objects (freezer, flags)) 562 if (!_save_objects (freezer, flags))
562 return false; 563 return false;
563 564
564 return freezer.save (path); 565 return freezer.save (path);
565} 566}
566 567
… …
730 * 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
731 * 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.
732 * MSW 2001-07-01 733 * MSW 2001-07-01
733 */ 734 */
734bool 735bool
735maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
736{ 737{
737 for (;;) 738 for (;;)
738 { 739 {
739 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
740 741
… …
791 case KW_sky: thawer.get (sky); break; 792 case KW_sky: thawer.get (sky); break;
792 793
793 case KW_per_player: thawer.get (per_player); break; 794 case KW_per_player: thawer.get (per_player); break;
794 case KW_per_party: thawer.get (per_party); break; 795 case KW_per_party: thawer.get (per_party); break;
795 796
796 case KW_region: get_region_by_name (thawer.get_str ()); break; 797 case KW_region: default_region = region::find (thawer.get_str ()); break;
797 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
798 799
799 // old names new names 800 // old names new names
800 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 801 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
801 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 802 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
816 817
817 abort (); 818 abort ();
818} 819}
819 820
820bool 821bool
821maptile::load_header (const char *path) 822maptile::_load_header (const char *path)
822{ 823{
823 object_thawer thawer (path); 824 object_thawer thawer (path);
824 825
825 if (!thawer) 826 if (!thawer)
826 return false; 827 return false;
827 828
828 return load_header (thawer); 829 return _load_header (thawer);
829} 830}
830 831
831/****************************************************************************** 832/******************************************************************************
832 * This is the start of unique map handling code 833 * This is the start of unique map handling code
833 *****************************************************************************/ 834 *****************************************************************************/
… …
856 } 857 }
857 } 858 }
858} 859}
859 860
860bool 861bool
861maptile::save_header (object_freezer &freezer) 862maptile::_save_header (object_freezer &freezer)
862{ 863{
863#define MAP_OUT(k) freezer.put (KW_ ## k, k) 864#define MAP_OUT(k) freezer.put (KW_ ## k, k)
864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 865#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
865 866
866 MAP_OUT2 (arch, "map"); 867 MAP_OUT2 (arch, "map");
… …
870 MAP_OUT (reset_time); 871 MAP_OUT (reset_time);
871 MAP_OUT (reset_timeout); 872 MAP_OUT (reset_timeout);
872 MAP_OUT (fixed_resettime); 873 MAP_OUT (fixed_resettime);
873 MAP_OUT (difficulty); 874 MAP_OUT (difficulty);
874 875
875 if (region) MAP_OUT2 (region, region->name); 876 if (default_region) MAP_OUT2 (region, default_region->name);
876 877
877 if (shopitems) 878 if (shopitems)
878 { 879 {
879 char shop[MAX_BUF]; 880 char shop[MAX_BUF];
880 print_shop_string (this, shop); 881 print_shop_string (this, shop);
… …
915 916
916 return true; 917 return true;
917} 918}
918 919
919bool 920bool
920maptile::save_header (const char *path) 921maptile::_save_header (const char *path)
921{ 922{
922 object_freezer freezer; 923 object_freezer freezer;
923 924
924 if (!save_header (freezer)) 925 if (!_save_header (freezer))
925 return false; 926 return false;
926 927
927 return freezer.save (path); 928 return freezer.save (path);
928} 929}
929 930
… …
931 * Remove and free all objects in the given map. 932 * Remove and free all objects in the given map.
932 */ 933 */
933void 934void
934maptile::clear () 935maptile::clear ()
935{ 936{
937 sfree (regions, size ()), regions = 0;
938 free (regionmap), regionmap = 0;
939
936 if (!spaces) 940 if (spaces)
937 return; 941 {
938
939 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 942 for (mapspace *ms = spaces + size (); ms-- > spaces; )
940 while (object *op = ms->bot) 943 while (object *op = ms->bot)
941 { 944 {
942 if (op->head) 945 if (op->head)
943 op = op->head; 946 op = op->head;
944 947
945 op->destroy_inv (false); 948 op->destroy_inv (false);
946 op->destroy (); 949 op->destroy ();
947 } 950 }
948 951
949 sfree (spaces, size ()), spaces = 0; 952 sfree (spaces, size ()), spaces = 0;
953 }
950 954
951 if (buttons) 955 if (buttons)
952 free_objectlinkpt (buttons), buttons = 0; 956 free_objectlinkpt (buttons), buttons = 0;
953} 957}
954 958
… …
1108 */ 1112 */
1109void 1113void
1110mapspace::update_ () 1114mapspace::update_ ()
1111{ 1115{
1112 object *tmp, *last = 0; 1116 object *tmp, *last = 0;
1113 uint8 flags = 0, light = 0, anywhere = 0; 1117 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 New_Face *top, *floor, *middle; 1118 facetile *top, *floor, *middle;
1115 object *top_obj, *floor_obj, *middle_obj; 1119 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1120 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1121
1118 middle = blank_face; 1122 middle = blank_face;
1119 top = blank_face; 1123 top = blank_face;
… …
1448 1452
1449/** 1453/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1454 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1455 * map1 to map2 in dx/dy.
1452 */ 1456 */
1453static int 1457int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1458adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1459{
1456 if (!map1 || !map2) 1460 if (!map1 || !map2)
1457 return 0; 1461 return 0;
1458 1462
… …
1549/* From map.c 1553/* From map.c
1550 * This is used by get_player to determine where the other 1554 * This is used by get_player to determine where the other
1551 * creature is. get_rangevector takes into account map tiling, 1555 * creature is. get_rangevector takes into account map tiling,
1552 * so you just can not look the the map coordinates and get the 1556 * so you just can not look the the map coordinates and get the
1553 * righte value. distance_x/y are distance away, which 1557 * righte value. distance_x/y are distance away, which
1554 * can be negativbe. direction is the crossfire direction scheme 1558 * can be negative. direction is the crossfire direction scheme
1555 * that the creature should head. part is the part of the 1559 * that the creature should head. part is the part of the
1556 * monster that is closest. 1560 * monster that is closest.
1557 * 1561 *
1558 * get_rangevector looks at op1 and op2, and fills in the 1562 * get_rangevector looks at op1 and op2, and fills in the
1559 * structure for op1 to get to op2. 1563 * structure for op1 to get to op2.
… …
1606 { 1610 {
1607 best_distance = tmpi; 1611 best_distance = tmpi;
1608 best = tmp; 1612 best = tmp;
1609 } 1613 }
1610 } 1614 }
1615
1611 if (best != op1) 1616 if (best != op1)
1612 { 1617 {
1613 retval->distance_x += op1->x - best->x; 1618 retval->distance_x += op1->x - best->x;
1614 retval->distance_y += op1->y - best->y; 1619 retval->distance_y += op1->y - best->y;
1615 } 1620 }
1616 } 1621 }
1622
1617 retval->part = best; 1623 retval->part = best;
1618 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1624 retval->distance = idistance (retval->distance_x, retval->distance_y);
1619 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1620 } 1626 }
1621} 1627}
1622 1628
1623/* this is basically the same as get_rangevector above, but instead of 1629/* this is basically the same as get_rangevector above, but instead of
… …
1628 * flags has no meaning for this function at this time - I kept it in to 1634 * flags has no meaning for this function at this time - I kept it in to
1629 * be more consistant with the above function and also in case they are needed 1635 * be more consistant with the above function and also in case they are needed
1630 * for something in the future. Also, since no object is pasted, the best 1636 * for something in the future. Also, since no object is pasted, the best
1631 * field of the rv_vector is set to NULL. 1637 * field of the rv_vector is set to NULL.
1632 */ 1638 */
1633
1634void 1639void
1635get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1640get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1636{ 1641{
1637 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1642 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1638 { 1643 {
1639 /* be conservative and fill in _some_ data */ 1644 /* be conservative and fill in _some_ data */
1640 retval->distance = 100000; 1645 retval->distance = 100000;
… …
1647 { 1652 {
1648 retval->distance_x += op2->x - x; 1653 retval->distance_x += op2->x - x;
1649 retval->distance_y += op2->y - y; 1654 retval->distance_y += op2->y - y;
1650 1655
1651 retval->part = NULL; 1656 retval->part = NULL;
1652 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1657 retval->distance = idistance (retval->distance_x, retval->distance_y);
1653 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1658 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1654 } 1659 }
1655} 1660}
1656 1661
1657/* Returns true of op1 and op2 are effectively on the same map 1662/* Returns true of op1 and op2 are effectively on the same map
… …
1677 op->remove (); 1682 op->remove ();
1678 1683
1679 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1684 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1680} 1685}
1681 1686
1687region *
1688maptile::region (int x, int y) const
1689{
1690 if (regions
1691 && regionmap
1692 && !OUT_OF_REAL_MAP (this, x, y))
1693 if (struct region *reg = regionmap [regions [y * width + x]])
1694 return reg;
1695
1696 if (default_region)
1697 return default_region;
1698
1699 return ::region::default_region ();
1700}
1701

Diff Legend

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