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.59 by root, Thu Jan 25 03:54:45 2007 UTC vs.
Revision 1.60 by root, Sat Jan 27 23:59:29 2007 UTC

… …
162 * they have to appear here in the headers, before the mapdef 162 * they have to appear here in the headers, before the mapdef
163 */ 163 */
164INTERFACE_CLASS (region) 164INTERFACE_CLASS (region)
165struct region : zero_initialised 165struct region : zero_initialised
166{ 166{
167 struct region *ACC (RW, next); /* pointer to next region, NULL for the last one */ 167 region *ACC (RW, next); /* pointer to next region, NULL for the last one */
168 char *ACC (RW, name); /* Shortend name of the region as maps refer to it */ 168 char *ACC (RW, name); /* Shortend name of the region as maps refer to it */
169 char *ACC (RW, parent_name); /* 169 char *ACC (RW, parent_name); /*
170 * So that parent and child regions can be defined in 170 * So that parent and child regions can be defined in
171 * any order, we keep hold of the parent_name during 171 * any order, we keep hold of the parent_name during
172 * initialisation, and the children get assigned to their 172 * initialisation, and the children get assigned to their
173 * parents later. (before runtime on the server though) 173 * parents later. (before runtime on the server though)
174 * nothing outside the init code should ever use this value. 174 * nothing outside the init code should ever use this value.
175 */ 175 */
176 struct region *ACC (RW, parent); /* 176 region *ACC (RW, parent); /*
177 * Pointer to the region that is a parent of the current 177 * Pointer to the region that is a parent of the current
178 * region, if a value isn't defined in the current region 178 * region, if a value isn't defined in the current region
179 * we traverse this series of pointers until it is. 179 * we traverse this series of pointers until it is.
180 */ 180 */
181 char *ACC (RW, longname); /* Official title of the region, this might be defined 181 char *ACC (RW, longname); /* Official title of the region, this might be defined
… …
184 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ 184 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
185 sint8 ACC (RW, fallback); /* whether, in the event of a region not existing, 185 sint8 ACC (RW, fallback); /* whether, in the event of a region not existing,
186 * this should be the one we fall back on as the default */ 186 * this should be the one we fall back on as the default */
187 char *ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ 187 char *ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */
188 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ 188 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */
189
190 static region *default_region ();
191 static region *find (const char *name);
189}; 192};
190 193
191struct shopitems : zero_initialised 194struct shopitems : zero_initialised
192{ 195{
193 const char *name; /* name of the item in question, null if it is the default item */ 196 const char *name; /* name of the item in question, null if it is the default item */
… …
216INTERFACE_CLASS (maptile) 219INTERFACE_CLASS (maptile)
217struct maptile : zero_initialised, attachable 220struct maptile : zero_initialised, attachable
218{ 221{
219 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ 222 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
220 struct mapspace *spaces; /* Array of spaces on this map */ 223 struct mapspace *spaces; /* Array of spaces on this map */
224 uint8 *regions; /* region index per mapspace, if != 0 */
225 struct region **regionmap; /* index to region */
221 226
222 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 227 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
223 228
224 shstr ACC (RW, name); /* Name of map as given by its creator */ 229 shstr ACC (RW, name); /* Name of map as given by its creator */
225 struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by 230 struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
… …
291 MTH void clear_unique_items (); 296 MTH void clear_unique_items ();
292 297
293 MTH void clear_header (); 298 MTH void clear_header ();
294 MTH void clear_links_to (maptile *m); 299 MTH void clear_links_to (maptile *m);
295 300
296 struct region *region (int x, int y) const 301 MTH struct region *region (int x, int y) const;
297 {
298 return default_region;
299 }
300 302
301 // loas the header pseudo-object 303 // loas the header pseudo-object
302 bool _load_header (object_thawer &thawer); 304 bool _load_header (object_thawer &thawer);
303 MTH bool _load_header (const char *path); 305 MTH bool _load_header (const char *path);
304 306

Diff Legend

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