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.68 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.71 by root, Sun Mar 11 02:12:44 2007 UTC

… …
118 * to extend information about a space. 118 * to extend information about a space.
119 */ 119 */
120struct mapspace 120struct mapspace
121{ 121{
122 object *bot, *top; /* lowest/highest object on this space */ 122 object *bot, *top; /* lowest/highest object on this space */
123 facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */ 123 faceidx faces[MAP_LAYERS]; /* faces for the 3 layers */
124 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ 124 object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
125 uint8 flags_; /* flags about this space (see the P_ values above) */ 125 uint8 flags_; /* flags about this space (see the P_ values above) */
126 sint8 light; /* How much light this space provides */ 126 sint8 light; /* How much light this space provides */
127 MoveType move_block; /* What movement types this space blocks */ 127 MoveType move_block; /* What movement types this space blocks */
128 MoveType move_slow; /* What movement types this space slows */ 128 MoveType move_slow; /* What movement types this space slows */
… …
192typedef object_vector<region, &region::index> regionvec; 192typedef object_vector<region, &region::index> regionvec;
193 193
194extern regionvec regions; 194extern regionvec regions;
195 195
196#define for_all_regions(var) \ 196#define for_all_regions(var) \
197 for (int _i = 0; _i < regions.size (); ++_i) \ 197 for (unsigned _i = 0; _i < regions.size (); ++_i) \
198 declvar (region *, var, regions [_i]) 198 declvar (region *, var, regions [_i])
199 199
200struct shopitems : zero_initialised 200struct shopitems : zero_initialised
201{ 201{
202 const char *name; /* name of the item in question, null if it is the default item */ 202 const char *name; /* name of the item in question, null if it is the default item */
… …
355 } 355 }
356 356
357 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 357 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
358 bool generate_random_map (random_map_params *RP); 358 bool generate_random_map (random_map_params *RP);
359 359
360 static maptile *find_async (const char *path, maptile *original = 0);//PERL
360 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 361 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
361 // async prefetch 362 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
362 static maptile *find_async (const char *path, maptile *original = 0);//PERL 363 MTH object *pick_random_object () const;
363 364
364 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 365 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
365 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 366 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
366}; 367};
367 368

Diff Legend

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