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.50 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.52 by root, Mon Jan 15 00:40:49 2007 UTC

… …
298 298
299 MTH void clear_header (); 299 MTH void clear_header ();
300 MTH void clear_links_to (maptile *m); 300 MTH void clear_links_to (maptile *m);
301 301
302 // loas the header pseudo-object 302 // loas the header pseudo-object
303 bool load_header (object_thawer &thawer); 303 bool _load_header (object_thawer &thawer);
304 MTH bool load_header (const char *path); 304 MTH bool _load_header (const char *path);
305 305
306 // load objects into the map 306 // load objects into the map
307 bool load_objects (object_thawer &thawer); 307 bool _load_objects (object_thawer &thawer);
308 MTH bool load_objects (const char *path, bool skip_header = true); 308 MTH bool _load_objects (const char *path, bool skip_header = true);
309 309
310 // save objects into the given file (uses IO_ flags) 310 // save objects into the given file (uses IO_ flags)
311 bool save_objects (object_freezer &freezer, int flags); 311 bool _save_objects (object_freezer &freezer, int flags);
312 MTH bool save_objects (const char *path, int flags); 312 MTH bool _save_objects (const char *path, int flags);
313 313
314 // save the header pseudo object _only_ 314 // save the header pseudo object _only_
315 bool save_header (object_freezer &freezer); 315 bool _save_header (object_freezer &freezer);
316 MTH bool save_header (const char *path); 316 MTH bool _save_header (const char *path);
317 317
318 maptile (); 318 maptile ();
319 maptile (int w, int h); 319 maptile (int w, int h);
320 ~maptile (); 320 ~maptile ();
321 321
… …
343 { 343 {
344 if (!spaces) 344 if (!spaces)
345 do_load_sync (); 345 do_load_sync ();
346 } 346 }
347 347
348 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
349 bool generate_random_map (random_map_params *RP);
350
348 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 351 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
349 // async prefetch 352 // async prefetch
350 static maptile *find_async (const char *path, maptile *original = 0);//PERL 353 static maptile *find_async (const char *path, maptile *original = 0);//PERL
351 354
352 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 355 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
… …
369 int distance_y; 372 int distance_y;
370 int direction; 373 int direction;
371 object *part; 374 object *part;
372}; 375};
373 376
377//TODO: these should be refactored into things like xy_normalise
378// and so on.
379int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
380int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y);
381int out_of_map(maptile *m, int x, int y);
382maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y);
383void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags);
384void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
385int on_same_map(const object *op1, const object *op2);
386
387// adjust map, x and y for tiled maps and return true if the position is valid at all
388inline bool
389xy_normalise (maptile *&map, sint16 &x, sint16 &y)
390{
391 // when in range, do a quick return, otherwise go the slow route
392 return
393 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
394 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
395}
396
374inline mapspace & 397inline mapspace &
375object::ms () const 398object::ms () const
376{ 399{
377 return map->at (x, y); 400 return map->at (x, y);
378} 401}

Diff Legend

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