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.54 by root, Thu Jan 18 16:19:34 2007 UTC vs.
Revision 1.64 by root, Thu Feb 1 19:15:39 2007 UTC

… …
47#define MAGIC_MAP_SIZE 50 47#define MAGIC_MAP_SIZE 50
48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 48#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
49 49
50#define MAP_LAYERS 3 50#define MAP_LAYERS 3
51 51
52/* options passed to ready_map_name and load_original_map */
53#define MAP_FLUSH 0x01
54#define MAP_PLAYER_UNIQUE 0x02
55#define MAP_BLOCK 0x04
56#define MAP_STYLE 0x08
57#define MAP_OVERLAY 0x10
58
59/* Values for in_memory below. Should probably be an enumerations */ 52/* Values for in_memory below. Should probably be an enumerations */
60enum { 53enum {
61 MAP_IN_MEMORY, 54 MAP_IN_MEMORY,
62 MAP_SWAPPED, 55 MAP_SWAPPED,
63 MAP_LOADING, 56 MAP_LOADING,
… …
83 76
84/* You should really know what you are doing before using this - you 77/* You should really know what you are doing before using this - you
85 * should almost always be using out_of_map instead, which takes into account 78 * should almost always be using out_of_map instead, which takes into account
86 * map tiling. 79 * map tiling.
87 */ 80 */
88#define OUT_OF_REAL_MAP(M,X,Y) !(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)) 81#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
89 82
90/* These are used in the MapLook flags element. They are not used in 83/* These are used in the MapLook flags element. They are not used in
91 * in the object flags structure. 84 * in the object flags structure.
92 */ 85 */
93#define P_BLOCKSVIEW 0x01 86#define P_BLOCKSVIEW 0x01
… …
125 * to extend information about a space. 118 * to extend information about a space.
126 */ 119 */
127struct mapspace 120struct mapspace
128{ 121{
129 object *bot, *top; /* lowest/highest object on this space */ 122 object *bot, *top; /* lowest/highest object on this space */
130 New_Face *faces[MAP_LAYERS]; /* faces for the 3 layers */ 123 facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */
131 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 124 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
132 uint8 flags_; /* flags about this space (see the P_ values above) */ 125 uint8 flags_; /* flags about this space (see the P_ values above) */
133 sint8 light; /* How much light this space provides */ 126 sint8 light; /* How much light this space provides */
134 MoveType move_block; /* What movement types this space blocks */ 127 MoveType move_block; /* What movement types this space blocks */
135 MoveType move_slow; /* What movement types this space slows */ 128 MoveType move_slow; /* What movement types this space slows */
… …
169 * they have to appear here in the headers, before the mapdef 162 * they have to appear here in the headers, before the mapdef
170 */ 163 */
171INTERFACE_CLASS (region) 164INTERFACE_CLASS (region)
172struct region : zero_initialised 165struct region : zero_initialised
173{ 166{
174 struct region *ACC (RW, next); /* pointer to next region, NULL for the last one */
175 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 */
176 char *ACC (RW, parent_name); /*
177 * So that parent and child regions can be defined in
178 * any order, we keep hold of the parent_name during
179 * initialisation, and the children get assigned to their
180 * parents later. (before runtime on the server though)
181 * nothing outside the init code should ever use this value.
182 */
183 struct region *ACC (RW, parent); /* 168 region *ACC (RW, parent); /*
184 * Pointer to the region that is a parent of the current 169 * Pointer to the region that is a parent of the current
185 * region, if a value isn't defined in the current region 170 * region, if a value isn't defined in the current region
186 * we traverse this series of pointers until it is. 171 * we traverse this series of pointers until it is.
187 */ 172 */
188 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
189 * to be the same as name*/ 174 * to be the same as name*/
190 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);
191 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. */
192 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,
193 * 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 */
194 char *ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ 182
195 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);
196}; 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])
197 195
198struct shopitems : zero_initialised 196struct shopitems : zero_initialised
199{ 197{
200 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 */
201 const char *name_pl; /* plural name */ 199 const char *name_pl; /* plural name */
… …
223INTERFACE_CLASS (maptile) 221INTERFACE_CLASS (maptile)
224struct maptile : zero_initialised, attachable 222struct maptile : zero_initialised, attachable
225{ 223{
226 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. */
227 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 */
228 228
229 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 */
230 230
231 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 */
232 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
233 * points to the struct containing all the properties of 233 * points to the struct containing all the properties of
234 * the region */ 234 * the region */
235 double ACC (RW, reset_time); 235 double ACC (RW, reset_time);
236 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
237 * should be reset 237 * should be reset
… …
249 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 */
250 250
251 bool ACC (RW, per_player); 251 bool ACC (RW, per_player);
252 bool ACC (RW, per_party); 252 bool ACC (RW, per_party);
253 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 */
254 uint8 ACC (RW, darkness); /* indicates level of darkness of map */ 255 uint8 ACC (RW, darkness); /* indicates level of darkness of map */
255 256
256 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 */
257 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 */
258 oblinkpt *buttons; /* Linked list of linked lists of buttons */ 259 oblinkpt *buttons; /* Linked list of linked lists of buttons */
… …
297 MTH void clear_unique_items (); 298 MTH void clear_unique_items ();
298 299
299 MTH void clear_header (); 300 MTH void clear_header ();
300 MTH void clear_links_to (maptile *m); 301 MTH void clear_links_to (maptile *m);
301 302
303 MTH struct region *region (int x, int y) const;
304
302 // loas the header pseudo-object 305 // loas the header pseudo-object
303 bool _load_header (object_thawer &thawer); 306 bool _load_header (object_thawer &thawer);
304 MTH bool _load_header (const char *path); 307 MTH bool _load_header (const char *path);
305 308
306 // load objects into the map 309 // load objects into the map
… …
374 object *part; 377 object *part;
375}; 378};
376 379
377//TODO: these should be refactored into things like xy_normalise 380//TODO: these should be refactored into things like xy_normalise
378// and so on. 381// and so on.
379int 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);
380int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); 383int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
381int out_of_map(maptile *m, int x, int y); 384int out_of_map (maptile *m, int x, int y);
382maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); 385maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
383void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); 386void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
384void 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);
385int 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);
386 390
387// 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
388inline bool 392inline bool
389xy_normalise (maptile *&map, sint16 &x, sint16 &y) 393xy_normalise (maptile *&map, sint16 &x, sint16 &y)
390{ 394{

Diff Legend

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