--- deliantra/server/include/map.h 2007/02/16 19:43:41 1.68 +++ deliantra/server/include/map.h 2007/03/01 12:28:16 1.70 @@ -194,7 +194,7 @@ extern regionvec regions; #define for_all_regions(var) \ - for (int _i = 0; _i < regions.size (); ++_i) \ + for (unsigned _i = 0; _i < regions.size (); ++_i) \ declvar (region *, var, regions [_i]) struct shopitems : zero_initialised @@ -357,9 +357,10 @@ void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); bool generate_random_map (random_map_params *RP); - static maptile *find_sync (const char *path, maptile *original = 0);//PERL - // async prefetch static maptile *find_async (const char *path, maptile *original = 0);//PERL + static maptile *find_sync (const char *path, maptile *original = 0);//PERL + static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL + MTH object *pick_random_object () const; mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }