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.46 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.47 by root, Thu Jan 4 16:19:32 2007 UTC

54#define MAP_BLOCK 0x04 54#define MAP_BLOCK 0x04
55#define MAP_STYLE 0x08 55#define MAP_STYLE 0x08
56#define MAP_OVERLAY 0x10 56#define MAP_OVERLAY 0x10
57 57
58/* Values for in_memory below. Should probably be an enumerations */ 58/* Values for in_memory below. Should probably be an enumerations */
59#define MAP_IN_MEMORY 1 59enum {
60#define MAP_SWAPPED 2 60 MAP_IN_MEMORY,
61#define MAP_LOADING 3 61 MAP_SWAPPED,
62#define MAP_SAVING 4 62 MAP_LOADING,
63 MAP_SAVING,
64};
63 65
64/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 66/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
65 * really be used, as it is multi tile aware. However, there are some cases 67 * really be used, as it is multi tile aware. However, there are some cases
66 * where it is known the map is not tiled or the values are known 68 * where it is known the map is not tiled or the values are known
67 * consistent (eg, op->map, op->x, op->y) 69 * consistent (eg, op->map, op->x, op->y)
323 325
324 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 326 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
325 327
326 MTH void touch () { last_access = runtime; } 328 MTH void touch () { last_access = runtime; }
327 329
328// static maptile *find_map (const char *path, maptile *origin);//PERL 330 // find the map that is at coordinate x|y relative to this map
329// 331 // TODO: need a better way than passing by reference
330// // load a map relative to this one 332 // TODO: make perl interface
331// maptile *find_map (const char *path) 333 maptile *xy_find (sint16 &x, sint16 &y);
332// { 334
333// return find_map (path, this); 335 // like xy_find, but also loads the map
334// } 336 maptile *xy_load (sint16 &x, sint16 &y);
335// 337
336// // customise this map for the given player
337// // might return this or a completely new map
338// maptile *customise_for (object *op);
339//
340// void do_force_map_sync ();//PERL 338 void do_load_sync ();//PERL
341// 339
342// // make sure the map is loaded 340 // make sure the map is loaded
343// MTH void force_map_sync () 341 MTH void load_sync ()
344// { 342 {
345// if (in_memory != MAP_IN_MEMORY) 343 if (!spaces)
346// do_force_map_sync (); 344 do_load_sync ();
347// } 345 }
348 346
349 static maptile *load_map_sync (const char *path, maptile *original = 0);//PERL 347 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
350 static void emergency_save ();//PERL 348 static void emergency_save ();//PERL
351 349
352 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 350 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
353 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 351 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
354}; 352};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines