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.60 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.73 by root, Sat Apr 14 07:23:00 2007 UTC

… …
65// all those macros are herewith declared legacy 65// all those macros are herewith declared legacy
66#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags () 66#define GET_MAP_FLAGS(M,X,Y) (M)->at((X),(Y)).flags ()
67#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light 67#define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light
68#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot 68#define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot
69#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top 69#define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top
70#define GET_MAP_FACE(M,X,Y,L) (M)->at((X),(Y)).faces[L]
71#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L] 70#define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L]
72#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block 71#define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block
73#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow 72#define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow
74#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on 73#define GET_MAP_MOVE_ON(M,X,Y) (M)->at((X),(Y)).move_on
75#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off 74#define GET_MAP_MOVE_OFF(M,X,Y) (M)->at((X),(Y)).move_off
… …
118 * to extend information about a space. 117 * to extend information about a space.
119 */ 118 */
120struct mapspace 119struct mapspace
121{ 120{
122 object *bot, *top; /* lowest/highest object on this space */ 121 object *bot, *top; /* lowest/highest object on this space */
123 facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */
124 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 122 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
125 uint8 flags_; /* flags about this space (see the P_ values above) */ 123 uint8 flags_; /* flags about this space (see the P_ values above) */
126 sint8 light; /* How much light this space provides */ 124 sint8 light; /* How much light this space provides */
127 MoveType move_block; /* What movement types this space blocks */ 125 MoveType move_block; /* What movement types this space blocks */
128 MoveType move_slow; /* What movement types this space slows */ 126 MoveType move_slow; /* What movement types this space slows */
… …
153 if (op->type == PLAYER) 151 if (op->type == PLAYER)
154 return op; 152 return op;
155 153
156 return 0; 154 return 0;
157 } 155 }
156
157 // return the item volume on this mapspace in cm³
158 uint64 volume () const;
158}; 159};
159 160
160/* 161/*
161 * Each map is in a given region of the game world and links to a region definiton, so 162 * 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 163 * they have to appear here in the headers, before the mapdef
163 */ 164 */
164INTERFACE_CLASS (region) 165INTERFACE_CLASS (region)
165struct region : zero_initialised 166struct region : zero_initialised
166{ 167{
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 shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */
169 char *ACC (RW, parent_name); /* 169 shstr ACC (RW, match); // a perl regex that matches map paths
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); /* 170 region *ACC (RW, parent); /*
177 * Pointer to the region that is a parent of the current 171 * Pointer to the region that is a parent of the current
178 * region, if a value isn't defined in the current region 172 * region, if a value isn't defined in the current region
179 * we traverse this series of pointers until it is. 173 * we traverse this series of pointers until it is.
180 */ 174 */
181 char *ACC (RW, longname); /* Official title of the region, this might be defined 175 shstr ACC (RW, longname); /* Official title of the region, this might be defined
182 * to be the same as name*/ 176 * to be the same as name*/
183 char *ACC (RW, msg); /* the description of the region */ 177 shstr ACC (RW, msg); /* the description of the region */
178 shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */
179 int ACC (RW, index);
184 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ 180 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
181 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, 182 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 */ 183 * 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. */
188 sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */
189 184
190 static region *default_region (); 185 static region *default_region ();
191 static region *find (const char *name); 186 static region *find (const char *name);
187 static region *find_fuzzy (const char *name);
188 static region *read (object_thawer &f);
192}; 189};
190
191typedef object_vector<region, &region::index> regionvec;
192
193extern regionvec regions;
194
195#define for_all_regions(var) \
196 for (unsigned _i = 0; _i < regions.size (); ++_i) \
197 declvar (region *, var, regions [_i])
193 198
194struct shopitems : zero_initialised 199struct shopitems : zero_initialised
195{ 200{
196 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 */
197 const char *name_pl; /* plural name */ 202 const char *name_pl; /* plural name */
… …
270 shstr ACC (RW, msg); /* Message map creator may have left */ 275 shstr ACC (RW, msg); /* Message map creator may have left */
271 shstr ACC (RW, maplore); /* Map lore information */ 276 shstr ACC (RW, maplore); /* Map lore information */
272 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 277 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
273 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 278 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
274 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
275 282
276 MTH void activate (); 283 MTH void activate ();
277 MTH void deactivate (); 284 MTH void deactivate ();
278 285
279 // allocates all (empty) mapspace 286 // allocates all (empty) mapspace
… …
347 } 354 }
348 355
349 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 356 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
350 bool generate_random_map (random_map_params *RP); 357 bool generate_random_map (random_map_params *RP);
351 358
359 static maptile *find_async (const char *path, maptile *original = 0);//PERL
352 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 360 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
353 // async prefetch 361 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
354 static maptile *find_async (const char *path, maptile *original = 0);//PERL 362 MTH object *pick_random_object () const;
355 363
356 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 364 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
357 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 365 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
358}; 366};
359 367
… …
375 object *part; 383 object *part;
376}; 384};
377 385
378//TODO: these should be refactored into things like xy_normalise 386//TODO: these should be refactored into things like xy_normalise
379// and so on. 387// and so on.
380int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 388int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
381int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y); 389int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
382int out_of_map(maptile *m, int x, int y); 390int out_of_map (maptile *m, int x, int y);
383maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); 391maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
384void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); 392void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
385void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 393void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
386int on_same_map(const object *op1, const object *op2); 394int on_same_map (const object *op1, const object *op2);
395int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
387 396
388// adjust map, x and y for tiled maps and return true if the position is valid at all 397// adjust map, x and y for tiled maps and return true if the position is valid at all
389inline bool 398inline bool
390xy_normalise (maptile *&map, sint16 &x, sint16 &y) 399xy_normalise (maptile *&map, sint16 &x, sint16 &y)
391{ 400{

Diff Legend

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