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.76 by pippijn, Mon Jan 15 21:06:18 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>
… …
400 * 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
401 * file pointer. 401 * file pointer.
402 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
403 */ 403 */
404bool 404bool
405maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
406{ 406{
407 int unique; 407 int unique;
408 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409 409
410 op = object::create (); 410 op = object::create ();
… …
486 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 487 op->deactivate_recursive ();
488} 488}
489 489
490bool 490bool
491maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
492{ 492{
493 static int cede_count = 0; 493 static int cede_count = 0;
494 494
495 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
496 save_header (freezer); 496 _save_header (freezer);
497 497
498 if (!spaces) 498 if (!spaces)
499 return false; 499 return false;
500 500
501 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
502 { 502 {
503#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500) 504 if (cede_count >= 500)
504 { 505 {
505 cede_count = 0; 506 cede_count = 0;
506 coroapi::cede (); 507 coroapi::cede ();
507 } 508 }
509#endif
508 510
509 int unique = 0; 511 int unique = 0;
510 for (object *op = spaces [i].bot; op; op = op->above) 512 for (object *op = spaces [i].bot; op; op = op->above)
511 { 513 {
512 // count per-object, but cede only when modification-safe 514 // count per-object, but cede only when modification-safe
… …
530 532
531 return true; 533 return true;
532} 534}
533 535
534bool 536bool
535maptile::load_objects (const char *path, bool skip_header) 537maptile::_load_objects (const char *path, bool skip_header)
536{ 538{
537 object_thawer thawer (path); 539 object_thawer thawer (path);
538 540
539 if (!thawer) 541 if (!thawer)
540 return false; 542 return false;
… …
548 break; 550 break;
549 551
550 thawer.skip_kv (kw); 552 thawer.skip_kv (kw);
551 } 553 }
552 554
553 return load_objects (thawer); 555 return _load_objects (thawer);
554} 556}
555 557
556bool 558bool
557maptile::save_objects (const char *path, int flags) 559maptile::_save_objects (const char *path, int flags)
558{ 560{
559 object_freezer freezer; 561 object_freezer freezer;
560 562
561 if (!save_objects (freezer, flags)) 563 if (!_save_objects (freezer, flags))
562 return false; 564 return false;
563 565
564 return freezer.save (path); 566 return freezer.save (path);
565} 567}
566 568
… …
730 * This could be done in lex (like the object loader), but I think 732 * 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. 733 * currently, there are few enough fields this is not a big deal.
732 * MSW 2001-07-01 734 * MSW 2001-07-01
733 */ 735 */
734bool 736bool
735maptile::load_header (object_thawer &thawer) 737maptile::_load_header (object_thawer &thawer)
736{ 738{
737 for (;;) 739 for (;;)
738 { 740 {
739 keyword kw = thawer.get_kv (); 741 keyword kw = thawer.get_kv ();
740 742
… …
816 818
817 abort (); 819 abort ();
818} 820}
819 821
820bool 822bool
821maptile::load_header (const char *path) 823maptile::_load_header (const char *path)
822{ 824{
823 object_thawer thawer (path); 825 object_thawer thawer (path);
824 826
825 if (!thawer) 827 if (!thawer)
826 return false; 828 return false;
827 829
828 return load_header (thawer); 830 return _load_header (thawer);
829} 831}
830 832
831/****************************************************************************** 833/******************************************************************************
832 * This is the start of unique map handling code 834 * This is the start of unique map handling code
833 *****************************************************************************/ 835 *****************************************************************************/
… …
856 } 858 }
857 } 859 }
858} 860}
859 861
860bool 862bool
861maptile::save_header (object_freezer &freezer) 863maptile::_save_header (object_freezer &freezer)
862{ 864{
863#define MAP_OUT(k) freezer.put (KW_ ## k, k) 865#define MAP_OUT(k) freezer.put (KW_ ## k, k)
864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
865 867
866 MAP_OUT2 (arch, "map"); 868 MAP_OUT2 (arch, "map");
… …
915 917
916 return true; 918 return true;
917} 919}
918 920
919bool 921bool
920maptile::save_header (const char *path) 922maptile::_save_header (const char *path)
921{ 923{
922 object_freezer freezer; 924 object_freezer freezer;
923 925
924 if (!save_header (freezer)) 926 if (!_save_header (freezer))
925 return false; 927 return false;
926 928
927 return freezer.save (path); 929 return freezer.save (path);
928} 930}
929 931
… …
1108 */ 1110 */
1109void 1111void
1110mapspace::update_ () 1112mapspace::update_ ()
1111{ 1113{
1112 object *tmp, *last = 0; 1114 object *tmp, *last = 0;
1113 uint8 flags = 0, light = 0, anywhere = 0; 1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1114 New_Face *top, *floor, *middle; 1116 New_Face *top, *floor, *middle;
1115 object *top_obj, *floor_obj, *middle_obj; 1117 object *top_obj, *floor_obj, *middle_obj;
1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1117 1119
1118 middle = blank_face; 1120 middle = blank_face;
… …
1606 { 1608 {
1607 best_distance = tmpi; 1609 best_distance = tmpi;
1608 best = tmp; 1610 best = tmp;
1609 } 1611 }
1610 } 1612 }
1613
1611 if (best != op1) 1614 if (best != op1)
1612 { 1615 {
1613 retval->distance_x += op1->x - best->x; 1616 retval->distance_x += op1->x - best->x;
1614 retval->distance_y += op1->y - best->y; 1617 retval->distance_y += op1->y - best->y;
1615 } 1618 }
1616 } 1619 }
1620
1617 retval->part = best; 1621 retval->part = best;
1618 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1622 retval->distance = idistance (retval->distance_x, retval->distance_y);
1619 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1620 } 1624 }
1621} 1625}
1622 1626
1623/* this is basically the same as get_rangevector above, but instead of 1627/* this is basically the same as get_rangevector above, but instead of
… …
1647 { 1651 {
1648 retval->distance_x += op2->x - x; 1652 retval->distance_x += op2->x - x;
1649 retval->distance_y += op2->y - y; 1653 retval->distance_y += op2->y - y;
1650 1654
1651 retval->part = NULL; 1655 retval->part = NULL;
1652 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1656 retval->distance = idistance (retval->distance_x, retval->distance_y);
1653 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1657 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1654 } 1658 }
1655} 1659}
1656 1660
1657/* Returns true of op1 and op2 are effectively on the same map 1661/* Returns true of op1 and op2 are effectively on the same map

Diff Legend

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