ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/map.h
(Generate patch)

Comparing deliantra/server/include/map.h (file contents):
Revision 1.85 by root, Mon Aug 27 06:29:17 2007 UTC vs.
Revision 1.87 by root, Tue Sep 4 05:43:21 2007 UTC

270 MTH void clear_header (); 270 MTH void clear_header ();
271 MTH void clear_links_to (maptile *m); 271 MTH void clear_links_to (maptile *m);
272 272
273 MTH struct region *region (int x, int y) const; 273 MTH struct region *region (int x, int y) const;
274 274
275 // loas the header pseudo-object 275 // load the header pseudo-object
276 bool _load_header (object_thawer &thawer); 276 bool _load_header (object_thawer &thawer);
277 MTH bool _load_header (const char *path); 277 MTH bool _load_header (object_thawer *thawer) { return _load_header (*thawer); }
278 278
279 // load objects into the map 279 // load objects into the map
280 bool _load_objects (object_thawer &thawer); 280 bool _load_objects (object_thawer &thawer);
281 MTH bool _load_objects (const char *path, bool skip_header = true); 281 MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
282 282
283 // save objects into the given file (uses IO_ flags) 283 // save objects into the given file (uses IO_ flags)
284 bool _save_objects (object_freezer &freezer, int flags); 284 bool _save_objects (object_freezer &freezer, int flags);
285 MTH bool _save_objects (const char *path, int flags); 285 MTH bool _save_objects (const char *path, int flags);
286 286
413 413
414 bool normalise () 414 bool normalise ()
415 { 415 {
416 return xy_normalise (m, x, y); 416 return xy_normalise (m, x, y);
417 } 417 }
418
419 object *insert (object *op, object *originator = 0, int flags = 0) const
420 {
421 m->insert (op, x, y, originator, flags);
422 }
418}; 423};
419 424
420inline const mapxy & 425inline const mapxy &
421object::operator =(const mapxy &pos) 426object::operator =(const mapxy &pos)
422{ 427{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines