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.111 by elmex, Thu Jul 12 18:28:09 2007 UTC vs.
Revision 1.113 by root, Fri Jul 13 15:54:40 2007 UTC

746 case KW_tile_path_1: thawer.get (tile_path [0]); break; 746 case KW_tile_path_1: thawer.get (tile_path [0]); break;
747 case KW_tile_path_2: thawer.get (tile_path [1]); break; 747 case KW_tile_path_2: thawer.get (tile_path [1]); break;
748 case KW_tile_path_3: thawer.get (tile_path [2]); break; 748 case KW_tile_path_3: thawer.get (tile_path [2]); break;
749 case KW_tile_path_4: thawer.get (tile_path [3]); break; 749 case KW_tile_path_4: thawer.get (tile_path [3]); break;
750 750
751 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value);
753 break;
754
751 case KW_end: 755 case KW_end:
752 return true; 756 return true;
753 757
754 default: 758 default:
755 if (!thawer.parse_error ("map", 0)) 759 if (!thawer.parse_error ("map", 0))
876 * Remove and free all objects in the given map. 880 * Remove and free all objects in the given map.
877 */ 881 */
878void 882void
879maptile::clear () 883maptile::clear ()
880{ 884{
881 sfree (regions, size ()), regions = 0; 885 sfree (regions, size ()); regions = 0;
882 free (regionmap), regionmap = 0; 886 delete [] regionmap; regionmap = 0;
883 887
884 if (spaces) 888 if (spaces)
885 { 889 {
886 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 890 for (mapspace *ms = spaces + size (); ms-- > spaces; )
887 while (object *op = ms->bot) 891 while (object *op = ms->bot)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines