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.82 by root, Mon Jan 29 16:11:48 2007 UTC vs.
Revision 1.83 by root, Thu Feb 1 19:15:38 2007 UTC

739 { 739 {
740 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
741 741
742 switch (kw) 742 switch (kw)
743 { 743 {
744 case KW_EOF:
745 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
746 return false;
747
748 case KW_end:
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;
755
756 case KW_msg: 744 case KW_msg:
757 thawer.get_ml (KW_endmsg, msg); 745 thawer.get_ml (KW_endmsg, msg);
758 break; 746 break;
759 747
760 case KW_lore: // CF+ extension 748 case KW_lore: // CF+ extension
810 798
811 case KW_tile_path_1: thawer.get (tile_path [0]); break; 799 case KW_tile_path_1: thawer.get (tile_path [0]); break;
812 case KW_tile_path_2: thawer.get (tile_path [1]); break; 800 case KW_tile_path_2: thawer.get (tile_path [1]); break;
813 case KW_tile_path_3: thawer.get (tile_path [2]); break; 801 case KW_tile_path_3: thawer.get (tile_path [2]); break;
814 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;
815 } 811 }
816 } 812 }
817 813
818 abort (); 814 abort ();
819} 815}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines