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.70 by pippijn, Thu Mar 1 12:28:16 2007 UTC

… …
153 if (op->type == PLAYER) 153 if (op->type == PLAYER)
154 return op; 154 return op;
155 155
156 return 0; 156 return 0;
157 } 157 }
158
159 // return the item volume on this mapspace in cm³
160 uint64 volume () const;
158}; 161};
159 162
160/* 163/*
161 * Each map is in a given region of the game world and links to a region definiton, so 164 * 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 165 * they have to appear here in the headers, before the mapdef
… …
181 * this should be the one we fall back on as the default */ 184 * this should be the one we fall back on as the default */
182 185
183 static region *default_region (); 186 static region *default_region ();
184 static region *find (const char *name); 187 static region *find (const char *name);
185 static region *find_fuzzy (const char *name); 188 static region *find_fuzzy (const char *name);
189 static region *read (object_thawer &f);
186}; 190};
187 191
188typedef object_vector<region, &region::index> regionvec; 192typedef object_vector<region, &region::index> regionvec;
189 193
190extern regionvec regions; 194extern regionvec regions;
191 195
192#define for_all_regions(var) \ 196#define for_all_regions(var) \
193 for (int _i = 0; _i < regions.size (); ++_i) \ 197 for (unsigned _i = 0; _i < regions.size (); ++_i) \
194 declvar (region *, var, regions [_i]) 198 declvar (region *, var, regions [_i])
195 199
196struct shopitems : zero_initialised 200struct shopitems : zero_initialised
197{ 201{
198 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 */
… …
272 shstr ACC (RW, msg); /* Message map creator may have left */ 276 shstr ACC (RW, msg); /* Message map creator may have left */
273 shstr ACC (RW, maplore); /* Map lore information */ 277 shstr ACC (RW, maplore); /* Map lore information */
274 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ 278 shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
275 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ 279 maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
276 shstr ACC (RW, path); /* Filename of the map */ 280 shstr ACC (RW, path); /* Filename of the map */
281 int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace
282 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
277 283
278 MTH void activate (); 284 MTH void activate ();
279 MTH void deactivate (); 285 MTH void deactivate ();
280 286
281 // allocates all (empty) mapspace 287 // allocates all (empty) mapspace
… …
349 } 355 }
350 356
351 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);
352 bool generate_random_map (random_map_params *RP); 358 bool generate_random_map (random_map_params *RP);
353 359
360 static maptile *find_async (const char *path, maptile *original = 0);//PERL
354 static maptile *find_sync (const char *path, maptile *original = 0);//PERL 361 static maptile *find_sync (const char *path, maptile *original = 0);//PERL
355 // async prefetch 362 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 363 MTH object *pick_random_object () const;
357 364
358 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]; }
359 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; } 366 mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }
360}; 367};
361 368

Diff Legend

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