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.66 by root, Wed Feb 7 23:50:01 2007 UTC

… …
153 if (op->type == PLAYER) 153 if (op->type == PLAYER)
154 return op; 154 return op;
155 155
156 return 0; 156 return 0;
157 } 157 }
158
159 // return the item volume on this mapspace in cm³
160 uint64 volume () const;
158}; 161};
159 162
160/* 163/*
161 * Each map is in a given region of the game world and links to a region definiton, so 164 * Each map is in a given region of the game world and links to a region definiton, so
162 * they have to appear here in the headers, before the mapdef 165 * they have to appear here in the headers, before the mapdef
163 */ 166 */
164INTERFACE_CLASS (region) 167INTERFACE_CLASS (region)
165struct region : zero_initialised 168struct region : zero_initialised
166{ 169{
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 */ 170 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); /* 171 region *ACC (RW, parent); /*
177 * Pointer to the region that is a parent of the current 172 * Pointer to the region that is a parent of the current
178 * region, if a value isn't defined in the current region 173 * region, if a value isn't defined in the current region
179 * we traverse this series of pointers until it is. 174 * we traverse this series of pointers until it is.
180 */ 175 */
181 char *ACC (RW, longname); /* Official title of the region, this might be defined 176 shstr ACC (RW, longname); /* Official title of the region, this might be defined
182 * to be the same as name*/ 177 * to be the same as name*/
183 char *ACC (RW, msg); /* the description of the region */ 178 shstr ACC (RW, msg); /* the description of the region */
179 shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */
180 int ACC (RW, index);
184 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ 181 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
182 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, 183 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 */ 184 * 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. */ 185
188 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ 186 static region *default_region ();
187 static region *find (const char *name);
188 static region *find_fuzzy (const char *name);
189}; 189};
190
191typedef object_vector<region, &region::index> regionvec;
192
193extern regionvec regions;
194
195#define for_all_regions(var) \
196 for (int _i = 0; _i < regions.size (); ++_i) \
197 declvar (region *, var, regions [_i])
190 198
191struct shopitems : zero_initialised 199struct shopitems : zero_initialised
192{ 200{
193 const char *name; /* name of the item in question, null if it is the default item */ 201 const char *name; /* name of the item in question, null if it is the default item */
194 const char *name_pl; /* plural name */ 202 const char *name_pl; /* plural name */
… …
216INTERFACE_CLASS (maptile) 224INTERFACE_CLASS (maptile)
217struct maptile : zero_initialised, attachable 225struct maptile : zero_initialised, attachable
218{ 226{
219 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */ 227 sint32 ACC (RW, width), ACC (RW, height); /* Width and height of map. */
220 struct mapspace *spaces; /* Array of spaces on this map */ 228 struct mapspace *spaces; /* Array of spaces on this map */
229 uint8 *regions; /* region index per mapspace, if != 0 */
230 struct region **regionmap; /* index to region */
221 231
222 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ 232 tstamp ACC (RW, last_access); /* last time this map was accessed somehow */
223 233
224 shstr ACC (RW, name); /* Name of map as given by its creator */ 234 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 235 struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
… …
265 shstr ACC (RW, msg); /* Message map creator may have left */ 275 shstr ACC (RW, msg); /* Message map creator may have left */
266 shstr ACC (RW, maplore); /* Map lore information */ 276 shstr ACC (RW, maplore); /* Map lore information */
267 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 277 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
268 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 278 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
269 shstr ACC (RW, path); /* Filename of the map */ 279 shstr ACC (RW, path); /* Filename of the map */
280 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
281 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
270 282
271 MTH void activate (); 283 MTH void activate ();
272 MTH void deactivate (); 284 MTH void deactivate ();
273 285
274 // allocates all (empty) mapspace 286 // allocates all (empty) mapspace
… …
291 MTH void clear_unique_items (); 303 MTH void clear_unique_items ();
292 304
293 MTH void clear_header (); 305 MTH void clear_header ();
294 MTH void clear_links_to (maptile *m); 306 MTH void clear_links_to (maptile *m);
295 307
296 struct region *region (int x, int y) const 308 MTH struct region *region (int x, int y) const;
297 {
298 return default_region;
299 }
300 309
301 // loas the header pseudo-object 310 // loas the header pseudo-object
302 bool _load_header (object_thawer &thawer); 311 bool _load_header (object_thawer &thawer);
303 MTH bool _load_header (const char *path); 312 MTH bool _load_header (const char *path);
304 313
… …
373 object *part; 382 object *part;
374}; 383};
375 384
376//TODO: these should be refactored into things like xy_normalise 385//TODO: these should be refactored into things like xy_normalise
377// and so on. 386// and so on.
378int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 387int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
379int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); 388int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
380int out_of_map(maptile *m, int x, int y); 389int out_of_map (maptile *m, int x, int y);
381maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); 390maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
382void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); 391void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
383void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 392void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
384int on_same_map(const object *op1, const object *op2); 393int on_same_map (const object *op1, const object *op2);
394int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
385 395
386// adjust map, x and y for tiled maps and return true if the position is valid at all 396// adjust map, x and y for tiled maps and return true if the position is valid at all
387inline bool 397inline bool
388xy_normalise (maptile *&map, sint16 &x, sint16 &y) 398xy_normalise (maptile *&map, sint16 &x, sint16 &y)
389{ 399{

Diff Legend

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