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.43 by root, Sun Dec 31 10:28:36 2006 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)
96 * this was introduced to make shops safer 98 * this was introduced to make shops safer
97 * but is useful in other situations */ 99 * but is useful in other situations */
98#define P_IS_ALIVE 0x10 /* something alive is on this space */ 100#define P_IS_ALIVE 0x10 /* something alive is on this space */
99#define P_NO_CLERIC 0x20 /* no clerical spells cast here */ 101#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
100 102
101#define P_NEED_UPDATE 0x80 /* this space is out of date */ 103#define P_UPTODATE 0x80 /* this space is up to date */
102 104
103/* The following two values are not stored in the MapLook flags, but instead 105/* The following two values are not stored in the MapLook flags, but instead
104 * used in the get_map_flags value - that function is used to return 106 * used in the get_map_flags value - that function is used to return
105 * the flag value, as well as other conditions - using a more general 107 * the flag value, as well as other conditions - using a more general
106 * function that does more of the work can hopefully be used to replace 108 * function that does more of the work can hopefully be used to replace
134 MoveType move_off; /* What movement types are activated */ 136 MoveType move_off; /* What movement types are activated */
135 137
136 void update_ (); 138 void update_ ();
137 void update () 139 void update ()
138 { 140 {
139 if (flags_ & P_NEED_UPDATE) 141 if (!(flags_ & P_UPTODATE))
140 update_ (); 142 update_ ();
141 } 143 }
142 144
143 uint8 flags () 145 uint8 flags ()
144 { 146 {
231 * the region */ 233 * the region */
232 double ACC (RW, reset_time); 234 double ACC (RW, reset_time);
233 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map 235 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
234 * should be reset 236 * should be reset
235 */ 237 */
238 bool ACC (RW, dirty); /* if true, something was inserted or removed */
236 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by 239 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
237 * players entering/exiting map 240 * players entering/exiting map
238 */ 241 */
239 sint32 ACC (RW, timeout); /* swapout is set to this */ 242 sint32 ACC (RW, timeout); /* swapout is set to this */
240 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ 243 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
284 MTH int change_map_light (int change); 287 MTH int change_map_light (int change);
285 static void change_all_map_light (int change); //PERL 288 static void change_all_map_light (int change); //PERL
286 MTH void set_darkness_map (); 289 MTH void set_darkness_map ();
287 MTH int estimate_difficulty () const; 290 MTH int estimate_difficulty () const;
288 291
292 // set the given flag on all objects in the map
293 MTH void set_object_flag (int flag, int value = 1);
294
289 MTH void link_multipart_objects (); 295 MTH void link_multipart_objects ();
290 MTH void clear_unique_items (); 296 MTH void clear_unique_items ();
291 297
292 MTH void clear_header (); 298 MTH void clear_header ();
293 MTH void clear_links_to (maptile *m); 299 MTH void clear_links_to (maptile *m);
317 323
318 MTH int size () const { return width * height; } 324 MTH int size () const { return width * height; }
319 325
320 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);
321 327
322// static maptile *find_map (const char *path, maptile *origin);//PERL 328 MTH void touch () { last_access = runtime; }
323// 329
324// // load a map relative to this one 330 // find the map that is at coordinate x|y relative to this map
325// maptile *find_map (const char *path) 331 // TODO: need a better way than passing by reference
326// { 332 // TODO: make perl interface
327// return find_map (path, this); 333 maptile *xy_find (sint16 &x, sint16 &y);
328// } 334
329// 335 // like xy_find, but also loads the map
330// // customise this map for the given player 336 maptile *xy_load (sint16 &x, sint16 &y);
331// // might return this or a completely new map 337
332// maptile *customise_for (object *op);
333//
334// void do_force_map_sync ();//PERL 338 void do_load_sync ();//PERL
335// 339
336// // make sure the map is loaded 340 // make sure the map is loaded
337// MTH void force_map_sync () 341 MTH void load_sync ()
338// { 342 {
339// if (in_memory != MAP_IN_MEMORY) 343 if (!spaces)
340// do_force_map_sync (); 344 do_load_sync ();
341// } 345 }
342 346
343 static maptile *load_map_sync (const char *path, maptile *original = 0);//PERL 347 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
344 static void emergency_save ();//PERL 348 static void emergency_save ();//PERL
345 349
346 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]; }
347 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 351 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
348}; 352};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines