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.74 by root, Thu Apr 19 16:23:47 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 }
158};
159 156
160/* 157 // return the item volume on this mapspace in cm³
161 * Each map is in a given region of the game world and links to a region definiton, so 158 uint64 volume () const;
162 * they have to appear here in the headers, before the mapdef
163 */
164INTERFACE_CLASS (region)
165struct region : zero_initialised
166{
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 */
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); /*
177 * Pointer to the region that is a parent of the current
178 * region, if a value isn't defined in the current region
179 * we traverse this series of pointers until it is.
180 */
181 char *ACC (RW, longname); /* Official title of the region, this might be defined
182 * to be the same as name*/
183 shstr ACC (RW, msg); /* the description of the region */
184 uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */
185 sint8 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 */
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
190 static region *default_region ();
191 static region *find (const char *name);
192 static region *find_fuzzy (const char *name);
193}; 159};
194 160
195struct shopitems : zero_initialised 161struct shopitems : zero_initialised
196{ 162{
197 const char *name; /* name of the item in question, null if it is the default item */ 163 const char *name; /* name of the item in question, null if it is the default item */
… …
271 shstr ACC (RW, msg); /* Message map creator may have left */ 237 shstr ACC (RW, msg); /* Message map creator may have left */
272 shstr ACC (RW, maplore); /* Map lore information */ 238 shstr ACC (RW, maplore); /* Map lore information */
273 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 239 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
274 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 240 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
275 shstr ACC (RW, path); /* Filename of the map */ 241 shstr ACC (RW, path); /* Filename of the map */
242 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
243 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
276 244
277 MTH void activate (); 245 MTH void activate ();
278 MTH void deactivate (); 246 MTH void deactivate ();
279 247
280 // allocates all (empty) mapspace 248 // allocates all (empty) mapspace
… …
348 } 316 }
349 317
350 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 318 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
351 bool generate_random_map (random_map_params *RP); 319 bool generate_random_map (random_map_params *RP);
352 320
321 static maptile *find_async (const char *path, maptile *original = 0);//PERL
353 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 322 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
354 // async prefetch 323 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
355 static maptile *find_async (const char *path, maptile *original = 0);//PERL 324 MTH object *pick_random_object () const;
356 325
357 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 326 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
358 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 327 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
359}; 328};
360 329
… …
376 object *part; 345 object *part;
377}; 346};
378 347
379//TODO: these should be refactored into things like xy_normalise 348//TODO: these should be refactored into things like xy_normalise
380// and so on. 349// and so on.
381int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 350int 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); 351int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
383int out_of_map(maptile *m, int x, int y); 352int out_of_map (maptile *m, int x, int y);
384maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y); 353maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
385void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags); 354void 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); 355void 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); 356int on_same_map (const object *op1, const object *op2);
357int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
388 358
389// adjust map, x and y for tiled maps and return true if the position is valid at all 359// adjust map, x and y for tiled maps and return true if the position is valid at all
390inline bool 360inline bool
391xy_normalise (maptile *&map, sint16 &x, sint16 &y) 361xy_normalise (maptile *&map, sint16 &x, sint16 &y)
392{ 362{

Diff Legend

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