--- deliantra/server/include/map.h 2007/08/01 01:53:13 1.81 +++ deliantra/server/include/map.h 2007/08/24 00:26:10 1.84 @@ -214,7 +214,6 @@ sint16 players; /* How many players are on this map right now */ uint16 ACC (RW, difficulty); /* What level the player should be to play here */ - bool ACC (RW, active); // wether this map is active or not bool ACC (RW, per_player); bool ACC (RW, per_party); bool ACC (RW, outdoor); /* True if an outdoor map */ @@ -302,6 +301,8 @@ MTH void touch () { last_access = runtime; } + MTH bool tile_available (int dir, bool load = true); + // find the map that is at coordinate x|y relative to this map // TODO: need a better way than passing by reference // TODO: make perl interface @@ -322,7 +323,7 @@ void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); bool generate_random_map (random_map_params *RP); - static maptile *find_async (const char *path, maptile *original = 0);//PERL + static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//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; @@ -376,12 +377,5 @@ return map->at (x, y); } -inline void -object::play_sound (faceidx sound) const -{ - if (map && sound) - map->play_sound (sound, x, y); -} - #endif