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.58 by root, Wed Jan 24 22:42:48 2007 UTC vs.
Revision 1.59 by root, Thu Jan 25 03:54:45 2007 UTC

220 struct mapspace *spaces; /* Array of spaces on this map */ 220 struct mapspace *spaces; /* Array of spaces on this map */
221 221
222 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 222 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
223 223
224 shstr ACC (RW, name); /* Name of map as given by its creator */ 224 shstr ACC (RW, name); /* Name of map as given by its creator */
225 struct region *ACC (RW, region); /* What jurisdiction in the game world this map is ruled by 225 struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
226 * points to the struct containing all the properties of 226 * points to the struct containing all the properties of
227 * the region */ 227 * the region */
228 double ACC (RW, reset_time); 228 double ACC (RW, reset_time);
229 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map 229 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
230 * should be reset 230 * should be reset
291 MTH void clear_unique_items (); 291 MTH void clear_unique_items ();
292 292
293 MTH void clear_header (); 293 MTH void clear_header ();
294 MTH void clear_links_to (maptile *m); 294 MTH void clear_links_to (maptile *m);
295 295
296 struct region *region (int x, int y) const
297 {
298 return default_region;
299 }
300
296 // loas the header pseudo-object 301 // loas the header pseudo-object
297 bool _load_header (object_thawer &thawer); 302 bool _load_header (object_thawer &thawer);
298 MTH bool _load_header (const char *path); 303 MTH bool _load_header (const char *path);
299 304
300 // load objects into the map 305 // load objects into the map

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines