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.62 by root, Mon Jan 29 15:04:21 2007 UTC vs.
Revision 1.65 by root, Wed Feb 7 02:04:46 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 kg/m³
160 uint64 volume ();
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 region *ACC (RW, next); /* pointer to next region, NULL for the last one */
168 shstr 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 shstr 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 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 shstr 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 shstr 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. */
189 185
190 static region *default_region (); 186 static region *default_region ();
191 static region *find (const char *name); 187 static region *find (const char *name);
192 static region *find_fuzzy (const char *name); 188 static region *find_fuzzy (const char *name);
193}; 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])
194 198
195struct shopitems : zero_initialised 199struct shopitems : zero_initialised
196{ 200{
197 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 */
198 const char *name_pl; /* plural name */ 202 const char *name_pl; /* plural name */
… …
376 object *part; 380 object *part;
377}; 381};
378 382
379//TODO: these should be refactored into things like xy_normalise 383//TODO: these should be refactored into things like xy_normalise
380// and so on. 384// and so on.
381int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 385int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
382int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); 386int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
383int out_of_map(maptile *m, int x, int y); 387int out_of_map (maptile *m, int x, int y);
384maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); 388maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
385void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); 389void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
386void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 390void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
387int on_same_map(const object *op1, const object *op2); 391int on_same_map (const object *op1, const object *op2);
392int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
388 393
389// adjust map, x and y for tiled maps and return true if the position is valid at all 394// adjust map, x and y for tiled maps and return true if the position is valid at all
390inline bool 395inline bool
391xy_normalise (maptile *&map, sint16 &x, sint16 &y) 396xy_normalise (maptile *&map, sint16 &x, sint16 &y)
392{ 397{

Diff Legend

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