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.74 by root, Sun Jan 14 23:35:03 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
… …
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
… …
729 * 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
730 * 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.
731 * MSW 2001-07-01 734 * MSW 2001-07-01
732 */ 735 */
733bool 736bool
734maptile::load_header (object_thawer &thawer) 737maptile::_load_header (object_thawer &thawer)
735{ 738{
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 (;;) 739 for (;;)
741 { 740 {
742 keyword kw = thawer.get_kv (); 741 keyword kw = thawer.get_kv ();
743 742
744 switch (kw) 743 switch (kw)
… …
747 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); 746 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
748 return false; 747 return false;
749 748
750 case KW_end: 749 case KW_end:
751 return true; 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;
752 756
753 case KW_msg: 757 case KW_msg:
754 thawer.get_ml (KW_endmsg, msg); 758 thawer.get_ml (KW_endmsg, msg);
755 break; 759 break;
756 760
… …
807 811
808 case KW_tile_path_1: thawer.get (tile_path [0]); break; 812 case KW_tile_path_1: thawer.get (tile_path [0]); break;
809 case KW_tile_path_2: thawer.get (tile_path [1]); break; 813 case KW_tile_path_2: thawer.get (tile_path [1]); break;
810 case KW_tile_path_3: thawer.get (tile_path [2]); break; 814 case KW_tile_path_3: thawer.get (tile_path [2]); break;
811 case KW_tile_path_4: thawer.get (tile_path [3]); break; 815 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 } 816 }
817 } 817 }
818 818
819 abort (); 819 abort ();
820} 820}
821 821
822bool 822bool
823maptile::load_header (const char *path) 823maptile::_load_header (const char *path)
824{ 824{
825 object_thawer thawer (path); 825 object_thawer thawer (path);
826 826
827 if (!thawer) 827 if (!thawer)
828 return false; 828 return false;
829 829
830 return load_header (thawer); 830 return _load_header (thawer);
831} 831}
832 832
833/****************************************************************************** 833/******************************************************************************
834 * This is the start of unique map handling code 834 * This is the start of unique map handling code
835 *****************************************************************************/ 835 *****************************************************************************/
… …
858 } 858 }
859 } 859 }
860} 860}
861 861
862bool 862bool
863maptile::save_header (object_freezer &freezer) 863maptile::_save_header (object_freezer &freezer)
864{ 864{
865#define MAP_OUT(k) freezer.put (KW_ ## k, k) 865#define MAP_OUT(k) freezer.put (KW_ ## k, k)
866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
867 867
868 MAP_OUT2 (arch, "map"); 868 MAP_OUT2 (arch, "map");
… …
917 917
918 return true; 918 return true;
919} 919}
920 920
921bool 921bool
922maptile::save_header (const char *path) 922maptile::_save_header (const char *path)
923{ 923{
924 object_freezer freezer; 924 object_freezer freezer;
925 925
926 if (!save_header (freezer)) 926 if (!_save_header (freezer))
927 return false; 927 return false;
928 928
929 return freezer.save (path); 929 return freezer.save (path);
930} 930}
931 931
… …
1110 */ 1110 */
1111void 1111void
1112mapspace::update_ () 1112mapspace::update_ ()
1113{ 1113{
1114 object *tmp, *last = 0; 1114 object *tmp, *last = 0;
1115 uint8 flags = 0, light = 0, anywhere = 0; 1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1116 New_Face *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1117 object *top_obj, *floor_obj, *middle_obj;
1118 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;
1119 1119
1120 middle = blank_face; 1120 middle = blank_face;

Diff Legend

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