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.57 by root, Sat Jan 20 23:39:09 2007 UTC vs.
Revision 1.64 by root, Thu Feb 1 19:15:39 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 */
168 char *ACC (RW, name); /* Shortend name of the region as maps refer to it */ 167 shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
169 char *ACC (RW, parent_name); /*
170 * So that parent and child regions can be defined in
171 * any order, we keep hold of the parent_name during
172 * initialisation, and the children get assigned to their
173 * parents later. (before runtime on the server though)
174 * nothing outside the init code should ever use this value.
175 */
176 struct region *ACC (RW, parent); /* 168 region *ACC (RW, parent); /*
177 * Pointer to the region that is a parent of the current 169 * Pointer to the region that is a parent of the current
178 * region, if a value isn't defined in the current region 170 * region, if a value isn't defined in the current region
179 * we traverse this series of pointers until it is. 171 * we traverse this series of pointers until it is.
180 */ 172 */
181 char *ACC (RW, longname); /* Official title of the region, this might be defined 173 shstr ACC (RW, longname); /* Official title of the region, this might be defined
182 * to be the same as name*/ 174 * to be the same as name*/
183 char *ACC (RW, msg); /* the description of the region */ 175 shstr ACC (RW, msg); /* the description of the region */
176 shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */
177 int ACC (RW, index);
184 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ 178 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
179 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */
185 sint8 ACC (RW, fallback); /* whether, in the event of a region not existing, 180 bool 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 */ 181 * 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. */ 182
188 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ 183 static region *default_region ();
184 static region *find (const char *name);
185 static region *find_fuzzy (const char *name);
189}; 186};
187
188typedef object_vector<region, &region::index> regionvec;
189
190extern regionvec regions;
191
192#define for_all_regions(var) \
193 for (int _i = 0; _i < regions.size (); ++_i) \
194 declvar (region *, var, regions [_i])
190 195
191struct shopitems : zero_initialised 196struct shopitems : zero_initialised
192{ 197{
193 const char *name; /* name of the item in question, null if it is the default item */ 198 const char *name; /* name of the item in question, null if it is the default item */
194 const char *name_pl; /* plural name */ 199 const char *name_pl; /* plural name */
… …
216INTERFACE_CLASS (maptile) 221INTERFACE_CLASS (maptile)
217struct maptile : zero_initialised, attachable 222struct maptile : zero_initialised, attachable
218{ 223{
219 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ 224 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
220 struct mapspace *spaces; /* Array of spaces on this map */ 225 struct mapspace *spaces; /* Array of spaces on this map */
226 uint8 *regions; /* region index per mapspace, if != 0 */
227 struct region **regionmap; /* index to region */
221 228
222 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 229 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
223 230
224 shstr ACC (RW, name); /* Name of map as given by its creator */ 231 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 232 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 233 * points to the struct containing all the properties of
227 * the region */ 234 * the region */
228 double ACC (RW, reset_time); 235 double ACC (RW, reset_time);
229 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map 236 uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map
230 * should be reset 237 * should be reset
… …
242 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 249 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
243 250
244 bool ACC (RW, per_player); 251 bool ACC (RW, per_player);
245 bool ACC (RW, per_party); 252 bool ACC (RW, per_party);
246 bool ACC (RW, outdoor); /* True if an outdoor map */ 253 bool ACC (RW, outdoor); /* True if an outdoor map */
254 bool ACC (RW, nodrop); /* avoid dropping anything on this map */
247 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 255 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
248 256
249 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ 257 uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */
250 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ 258 uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */
251 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 259 oblinkpt *buttons; /* Linked list of linked lists of buttons */
… …
290 MTH void clear_unique_items (); 298 MTH void clear_unique_items ();
291 299
292 MTH void clear_header (); 300 MTH void clear_header ();
293 MTH void clear_links_to (maptile *m); 301 MTH void clear_links_to (maptile *m);
294 302
303 MTH struct region *region (int x, int y) const;
304
295 // loas the header pseudo-object 305 // loas the header pseudo-object
296 bool _load_header (object_thawer &thawer); 306 bool _load_header (object_thawer &thawer);
297 MTH bool _load_header (const char *path); 307 MTH bool _load_header (const char *path);
298 308
299 // load objects into the map 309 // load objects into the map
… …
367 object *part; 377 object *part;
368}; 378};
369 379
370//TODO: these should be refactored into things like xy_normalise 380//TODO: these should be refactored into things like xy_normalise
371// and so on. 381// and so on.
372int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 382int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
373int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); 383int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
374int out_of_map(maptile *m, int x, int y); 384int out_of_map (maptile *m, int x, int y);
375maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); 385maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
376void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); 386void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
377void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 387void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
378int on_same_map(const object *op1, const object *op2); 388int on_same_map (const object *op1, const object *op2);
389int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
379 390
380// adjust map, x and y for tiled maps and return true if the position is valid at all 391// adjust map, x and y for tiled maps and return true if the position is valid at all
381inline bool 392inline bool
382xy_normalise (maptile *&map, sint16 &x, sint16 &y) 393xy_normalise (maptile *&map, sint16 &x, sint16 &y)
383{ 394{

Diff Legend

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