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.64 by root, Thu Feb 1 19:15:39 2007 UTC vs.
Revision 1.72 by root, Mon Mar 12 01:13:10 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
… …
181 * this should be the one we fall back on as the default */ 182 * this should be the one we fall back on as the default */
182 183
183 static region *default_region (); 184 static region *default_region ();
184 static region *find (const char *name); 185 static region *find (const char *name);
185 static region *find_fuzzy (const char *name); 186 static region *find_fuzzy (const char *name);
187 static region *read (object_thawer &f);
186}; 188};
187 189
188typedef object_vector<region, &region::index> regionvec; 190typedef object_vector<region, &region::index> regionvec;
189 191
190extern regionvec regions; 192extern regionvec regions;
191 193
192#define for_all_regions(var) \ 194#define for_all_regions(var) \
193 for (int _i = 0; _i < regions.size (); ++_i) \ 195 for (unsigned _i = 0; _i < regions.size (); ++_i) \
194 declvar (region *, var, regions [_i]) 196 declvar (region *, var, regions [_i])
195 197
196struct shopitems : zero_initialised 198struct shopitems : zero_initialised
197{ 199{
198 const char *name; /* name of the item in question, null if it is the default item */ 200 const char *name; /* name of the item in question, null if it is the default item */
… …
272 shstr ACC (RW, msg); /* Message map creator may have left */ 274 shstr ACC (RW, msg); /* Message map creator may have left */
273 shstr ACC (RW, maplore); /* Map lore information */ 275 shstr ACC (RW, maplore); /* Map lore information */
274 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 276 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
275 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 277 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
276 shstr ACC (RW, path); /* Filename of the map */ 278 shstr ACC (RW, path); /* Filename of the map */
279 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
280 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
277 281
278 MTH void activate (); 282 MTH void activate ();
279 MTH void deactivate (); 283 MTH void deactivate ();
280 284
281 // allocates all (empty) mapspace 285 // allocates all (empty) mapspace
… …
349 } 353 }
350 354
351 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); 355 void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
352 bool generate_random_map (random_map_params *RP); 356 bool generate_random_map (random_map_params *RP);
353 357
358 static maptile *find_async (const char *path, maptile *original = 0);//PERL
354 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 359 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
355 // async prefetch 360 static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
356 static maptile *find_async (const char *path, maptile *original = 0);//PERL 361 MTH object *pick_random_object () const;
357 362
358 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } 363 mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
359 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 364 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
360}; 365};
361 366

Diff Legend

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