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.69 by root, Thu Jan 4 16:56:39 2007 UTC vs.
Revision 1.79 by root, Sat Jan 20 22:09:51 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 <global.h>
25#include <funcpoint.h> 26#include <funcpoint.h>
26 27
27#include <loader.h> 28#include <loader.h>
… …
227 228
228 } 229 }
229 return 0; 230 return 0;
230} 231}
231 232
232
233/* 233/*
234 * 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.
235 * This is meant for multi space objects - for single space objecs, 235 * This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 236 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 237 * of object. This function goes through all the parts of the
… …
399 * 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
400 * file pointer. 400 * file pointer.
401 * mapflags is the same as we get with load_original_map 401 * mapflags is the same as we get with load_original_map
402 */ 402 */
403bool 403bool
404maptile::load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &thawer)
405{ 405{
406 int unique; 406 int unique;
407 object *op, *prev = NULL, *last_more = NULL, *otmp; 407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408 408
409 op = object::create (); 409 op = object::create ();
… …
485 for (object *op = ms->bot; op; op = op->above) 485 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 486 op->deactivate_recursive ();
487} 487}
488 488
489bool 489bool
490maptile::save_objects (object_freezer &freezer, int flags) 490maptile::_save_objects (object_freezer &freezer, int flags)
491{ 491{
492 static int cede_count = 0; 492 static int cede_count = 0;
493 493
494 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
495 save_header (freezer); 495 _save_header (freezer);
496 496
497 if (!spaces) 497 if (!spaces)
498 return false; 498 return false;
499 499
500 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
501 { 501 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
502 if (cede_count >= 500) 503 if (cede_count >= 500)
503 { 504 {
504 cede_count = 0; 505 cede_count = 0;
505 coroapi::cede (); 506 coroapi::cede ();
506 } 507 }
508#endif
507 509
508 int unique = 0; 510 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 511 for (object *op = spaces [i].bot; op; op = op->above)
510 { 512 {
511 // count per-object, but cede only when modification-safe 513 // count per-object, but cede only when modification-safe
… …
529 531
530 return true; 532 return true;
531} 533}
532 534
533bool 535bool
534maptile::load_objects (const char *path, bool skip_header) 536maptile::_load_objects (const char *path, bool skip_header)
535{ 537{
536 object_thawer thawer (path); 538 object_thawer thawer (path);
537 539
538 if (!thawer) 540 if (!thawer)
539 return false; 541 return false;
… …
547 break; 549 break;
548 550
549 thawer.skip_kv (kw); 551 thawer.skip_kv (kw);
550 } 552 }
551 553
552 return load_objects (thawer); 554 return _load_objects (thawer);
553} 555}
554 556
555bool 557bool
556maptile::save_objects (const char *path, int flags) 558maptile::_save_objects (const char *path, int flags)
557{ 559{
558 object_freezer freezer; 560 object_freezer freezer;
559 561
560 if (!save_objects (freezer, flags)) 562 if (!_save_objects (freezer, flags))
561 return false; 563 return false;
562 564
563 return freezer.save (path); 565 return freezer.save (path);
564} 566}
565 567
… …
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 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
737 int msgpos = 0;
738 int maplorepos = 0;
739
740 for (;;) 738 for (;;)
741 { 739 {
742 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
743 741
744 switch (kw) 742 switch (kw)
… …
747 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); 745 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
748 return false; 746 return false;
749 747
750 case KW_end: 748 case KW_end:
751 return true; 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;
752 755
753 case KW_msg: 756 case KW_msg:
754 thawer.get_ml (KW_endmsg, msg); 757 thawer.get_ml (KW_endmsg, msg);
755 break; 758 break;
756 759
… …
807 810
808 case KW_tile_path_1: thawer.get (tile_path [0]); break; 811 case KW_tile_path_1: thawer.get (tile_path [0]); break;
809 case KW_tile_path_2: thawer.get (tile_path [1]); break; 812 case KW_tile_path_2: thawer.get (tile_path [1]); break;
810 case KW_tile_path_3: thawer.get (tile_path [2]); break; 813 case KW_tile_path_3: thawer.get (tile_path [2]); break;
811 case KW_tile_path_4: thawer.get (tile_path [3]); break; 814 case KW_tile_path_4: thawer.get (tile_path [3]); break;
812
813 default:
814 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
815 break;
816 } 815 }
817 } 816 }
818 817
819 abort (); 818 abort ();
820} 819}
821 820
822bool 821bool
823maptile::load_header (const char *path) 822maptile::_load_header (const char *path)
824{ 823{
825 object_thawer thawer (path); 824 object_thawer thawer (path);
826 825
827 if (!thawer) 826 if (!thawer)
828 return false; 827 return false;
829 828
830 return load_header (thawer); 829 return _load_header (thawer);
831} 830}
832 831
833/****************************************************************************** 832/******************************************************************************
834 * This is the start of unique map handling code 833 * This is the start of unique map handling code
835 *****************************************************************************/ 834 *****************************************************************************/
… …
858 } 857 }
859 } 858 }
860} 859}
861 860
862bool 861bool
863maptile::save_header (object_freezer &freezer) 862maptile::_save_header (object_freezer &freezer)
864{ 863{
865#define MAP_OUT(k) freezer.put (KW_ ## k, k) 864#define MAP_OUT(k) freezer.put (KW_ ## k, k)
866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 865#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
867 866
868 MAP_OUT2 (arch, "map"); 867 MAP_OUT2 (arch, "map");
… …
917 916
918 return true; 917 return true;
919} 918}
920 919
921bool 920bool
922maptile::save_header (const char *path) 921maptile::_save_header (const char *path)
923{ 922{
924 object_freezer freezer; 923 object_freezer freezer;
925 924
926 if (!save_header (freezer)) 925 if (!_save_header (freezer))
927 return false; 926 return false;
928 927
929 return freezer.save (path); 928 return freezer.save (path);
930} 929}
931 930
… …
1110 */ 1109 */
1111void 1110void
1112mapspace::update_ () 1111mapspace::update_ ()
1113{ 1112{
1114 object *tmp, *last = 0; 1113 object *tmp, *last = 0;
1115 uint8 flags = 0, light = 0, anywhere = 0; 1114 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1115 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1116 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1117 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1118
1120 middle = blank_face; 1119 middle = blank_face;
1121 top = blank_face; 1120 top = blank_face;
… …
1551/* From map.c 1550/* From map.c
1552 * This is used by get_player to determine where the other 1551 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1552 * creature is. get_rangevector takes into account map tiling,
1554 * so you just can not look the the map coordinates and get the 1553 * so you just can not look the the map coordinates and get the
1555 * righte value. distance_x/y are distance away, which 1554 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1555 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1556 * that the creature should head. part is the part of the
1558 * monster that is closest. 1557 * monster that is closest.
1559 * 1558 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1559 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1560 * structure for op1 to get to op2.
… …
1608 { 1607 {
1609 best_distance = tmpi; 1608 best_distance = tmpi;
1610 best = tmp; 1609 best = tmp;
1611 } 1610 }
1612 } 1611 }
1612
1613 if (best != op1) 1613 if (best != op1)
1614 { 1614 {
1615 retval->distance_x += op1->x - best->x; 1615 retval->distance_x += op1->x - best->x;
1616 retval->distance_y += op1->y - best->y; 1616 retval->distance_y += op1->y - best->y;
1617 } 1617 }
1618 } 1618 }
1619
1619 retval->part = best; 1620 retval->part = best;
1620 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1621 retval->distance = idistance (retval->distance_x, retval->distance_y);
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1623 }
1623} 1624}
1624 1625
1625/* this is basically the same as get_rangevector above, but instead of 1626/* this is basically the same as get_rangevector above, but instead of
… …
1649 { 1650 {
1650 retval->distance_x += op2->x - x; 1651 retval->distance_x += op2->x - x;
1651 retval->distance_y += op2->y - y; 1652 retval->distance_y += op2->y - y;
1652 1653
1653 retval->part = NULL; 1654 retval->part = NULL;
1654 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1655 retval->distance = idistance (retval->distance_x, retval->distance_y);
1655 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1656 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656 } 1657 }
1657} 1658}
1658 1659
1659/* Returns true of op1 and op2 are effectively on the same map 1660/* Returns true of op1 and op2 are effectively on the same map

Diff Legend

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