--- deliantra/server/common/map.C 2007/07/12 18:28:09 1.111 +++ deliantra/server/common/map.C 2007/08/25 22:19:26 1.121 @@ -30,72 +30,6 @@ #include "path.h" -/* - * This makes a path absolute outside the world of Crossfire. - * In other words, it prepends LIBDIR/MAPDIR/ to the given path - * and returns the pointer to a static array containing the result. - * it really should be called create_mapname - */ -const char * -create_pathname (const char *name) -{ - static char buf[8192]; - snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name); - return buf; -} - -/* - * This function checks if a file with the given path exists. - * -1 is returned if it fails, otherwise the mode of the file - * is returned. - * It tries out all the compression suffixes listed in the uncomp[] array. - * - * If prepend_dir is set, then we call create_pathname (which prepends - * libdir & mapdir). Otherwise, we assume the name given is fully - * complete. - * Only the editor actually cares about the writablity of this - - * the rest of the code only cares that the file is readable. - * when the editor goes away, the call to stat should probably be - * replaced by an access instead (similar to the windows one, but - * that seems to be missing the prepend_dir processing - */ -int -check_path (const char *name, int prepend_dir) -{ - char buf[MAX_BUF]; - - char *endbuf; - struct stat statbuf; - int mode = 0; - - if (prepend_dir) - assign (buf, create_pathname (name)); - else - assign (buf, name); - - /* old method (strchr(buf, '\0')) seemd very odd to me - - * this method should be equivalant and is clearer. - * Can not use strcat because we need to cycle through - * all the names. - */ - endbuf = buf + strlen (buf); - - if (stat (buf, &statbuf)) - return -1; - if (!S_ISREG (statbuf.st_mode)) - return (-1); - - if (((statbuf.st_mode & S_IRGRP) && getegid () == statbuf.st_gid) || - ((statbuf.st_mode & S_IRUSR) && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IROTH)) - mode |= 4; - - if ((statbuf.st_mode & S_IWGRP && getegid () == statbuf.st_gid) || - (statbuf.st_mode & S_IWUSR && geteuid () == statbuf.st_uid) || (statbuf.st_mode & S_IWOTH)) - mode |= 2; - - return (mode); -} - /* This rolls up wall, blocks_magic, blocks_view, etc, all into * one function that just returns a P_.. value (see map.h) * it will also do map translation for tiled maps, returning @@ -423,8 +357,6 @@ void maptile::activate () { - active = true; - if (spaces) for (mapspace *ms = spaces + size (); ms-- > spaces; ) for (object *op = ms->bot; op; op = op->above) @@ -434,8 +366,6 @@ void maptile::deactivate () { - active = false; - if (spaces) for (mapspace *ms = spaces + size (); ms-- > spaces; ) for (object *op = ms->bot; op; op = op->above) @@ -455,21 +385,21 @@ for (int i = 0; i < size (); ++i) { - int unique = 0; + bool unique = 0; + for (object *op = spaces [i].bot; op; op = op->above) { - if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) - unique = 1; + unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]; - if (!op->can_map_save ()) + if (expect_false (!op->can_map_save ())) continue; - if (unique || op->flag [FLAG_UNIQUE]) + if (expect_false (unique || op->flag [FLAG_UNIQUE])) { if (flags & IO_UNIQUES) op->write (f); } - else if (flags & IO_OBJECTS) + else if (expect_true (flags & IO_OBJECTS)) op->write (f); } } @@ -748,6 +678,10 @@ case KW_tile_path_3: thawer.get (tile_path [2]); break; case KW_tile_path_4: thawer.get (tile_path [3]); break; + case KW_ERROR: + set_key (thawer.kw_str, thawer.value); + break; + case KW_end: return true; @@ -878,8 +812,8 @@ void maptile::clear () { - sfree (regions, size ()), regions = 0; - free (regionmap), regionmap = 0; + sfree (regions, size ()); regions = 0; + delete [] regionmap; regionmap = 0; if (spaces) { @@ -1292,47 +1226,19 @@ return vol; } -/* this updates the orig_map->tile_map[tile_num] value after finding - * the map. It also takes care of linking back the freshly found - * maps tile_map values if it tiles back to this one. It returns - * the value of orig_map->tile_map[tile_num]. - */ -static inline maptile * -find_and_link (maptile *orig_map, int tile_num) +bool +maptile::tile_available (int dir, bool load) { - maptile *mp = orig_map->tile_map [tile_num]; - - if (!mp) - { - mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map); - - if (!mp) - { - // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine - LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", - &orig_map->tile_path[tile_num], &orig_map->path); - mp = new maptile (1, 1); - mp->alloc (); - mp->in_memory = MAP_IN_MEMORY; - } - } - - int dest_tile = (tile_num + 2) % 4; - - orig_map->tile_map [tile_num] = mp; + if (!tile_path[dir]) + return 0; - // optimisation: back-link map to origin map if euclidean - //TODO: non-euclidean maps MUST GO - if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) - orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; + if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) + return 1; - return mp; -} + if ((tile_map[dir] = find_async (tile_path[dir], this, load))) + return 1; -static inline void -load_and_link (maptile *orig_map, int tile_num) -{ - find_and_link (orig_map, tile_num)->load_sync (); + return 0; } /* this returns TRUE if the coordinates (x,y) are out of @@ -1355,45 +1261,33 @@ if (x < 0) { - if (!m->tile_path[3]) + if (!m->tile_available (3)) return 1; - if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) - find_and_link (m, 3); - return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); } if (x >= m->width) { - if (!m->tile_path[1]) + if (!m->tile_available (1)) return 1; - if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) - find_and_link (m, 1); - return out_of_map (m->tile_map[1], x - m->width, y); } if (y < 0) { - if (!m->tile_path[0]) + if (!m->tile_available (0)) return 1; - if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) - find_and_link (m, 0); - return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); } if (y >= m->height) { - if (!m->tile_path[2]) + if (!m->tile_available (2)) return 1; - if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) - find_and_link (m, 2); - return out_of_map (m->tile_map[2], x, y - m->height); } @@ -1416,40 +1310,36 @@ { if (x < 0) { - if (!tile_path[3]) + if (!tile_available (3)) return 0; - find_and_link (this, 3); x += tile_map[3]->width; return tile_map[3]->xy_find (x, y); } if (x >= width) { - if (!tile_path[1]) + if (!tile_available (1)) return 0; - find_and_link (this, 1); x -= width; return tile_map[1]->xy_find (x, y); } if (y < 0) { - if (!tile_path[0]) + if (!tile_available (0)) return 0; - find_and_link (this, 0); y += tile_map[0]->height; return tile_map[0]->xy_find (x, y); } if (y >= height) { - if (!tile_path[2]) + if (!tile_available (2)) return 0; - find_and_link (this, 2); y -= height; return tile_map[2]->xy_find (x, y); } @@ -1470,7 +1360,7 @@ if (!map1 || !map2) return 0; - //TODO: this doesn't actually check corretcly when intermediate maps are not loaded + //TODO: this doesn't actually check correctly when intermediate maps are not loaded //fix: compare paths instead (this is likely faster, too!) if (map1 == map2) { @@ -1734,3 +1624,23 @@ return get_archetype ("blocked"); } +void +maptile::play_sound (faceidx sound, int x, int y) const +{ + if (!sound) + return; + + for_all_players (pl) + if (pl->ob->map == this) + if (client *ns = pl->ns) + { + int dx = x - pl->ob->x; + int dy = y - pl->ob->y; + + int distance = idistance (dx, dy); + + if (distance <= MAX_SOUND_DISTANCE) + ns->play_sound (sound, dx, dy); + } +} +