--- deliantra/server/common/map.C 2006/12/27 18:09:48 1.55 +++ deliantra/server/common/map.C 2006/12/30 10:16:10 1.56 @@ -30,29 +30,11 @@ #include "path.h" /* - * Returns the maptile which has a name matching the given argument. - * return NULL if no match is found. - */ -maptile * -has_been_loaded (const char *name) -{ - if (!name || !*name) - return 0; - - for_all_maps (map) - if (!strcmp (name, map->path)) - return map; - - return 0; -} - -/* * 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) { @@ -71,7 +53,6 @@ /* * same as create_pathname, but for the overlay maps. */ - const char * create_overlay_pathname (const char *name) { @@ -90,7 +71,6 @@ /* * same as create_pathname, but for the template maps. */ - const char * create_template_pathname (const char *name) { @@ -132,7 +112,6 @@ 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 @@ -148,7 +127,6 @@ * 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) { @@ -186,44 +164,6 @@ return (mode); } -/* - * Prints out debug-information about a map. - * Dumping these at llevError doesn't seem right, but is - * necessary to make sure the information is in fact logged. - */ - -void -dump_map (const maptile *m) -{ - LOG (llevError, "Map %s status: %d.\n", m->path, m->in_memory); - LOG (llevError, "Size: %dx%d Start: %d,%d\n", m->width, m->height, m->enter_x, m->enter_y); - - if (m->msg != NULL) - LOG (llevError, "Message:\n%s", m->msg); - - if (m->maplore != NULL) - LOG (llevError, "Lore:\n%s", m->maplore); - - if (m->tmpname != NULL) - LOG (llevError, "Tmpname: %s\n", m->tmpname); - - LOG (llevError, "Difficulty: %d\n", m->difficulty); - LOG (llevError, "Darkness: %d\n", m->darkness); -} - -/* - * Prints out debug-information about all maps. - * This basically just goes through all the maps and calls - * dump_map on each one. - */ - -void -dump_all_maps (void) -{ - for_all_maps (m) - dump_map (m); -} - /* 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 @@ -237,26 +177,19 @@ int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) { - sint16 newx, newy; - int retval = 0; - maptile *mp; - - newx = x; - newy = y; + sint16 newx = x; + sint16 newy = y; - mp = get_map_from_coord (oldmap, &newx, &newy); + maptile *mp = get_map_from_coord (oldmap, &newx, &newy); if (!mp) return P_OUT_OF_MAP; - if (mp != oldmap) - retval |= P_NEW_MAP; - if (newmap) *newmap = mp; if (nx) *nx = newx; if (ny) *ny = newy; - return retval | mp->at (newx, newy).flags (); + return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0); } /* @@ -421,7 +354,6 @@ mapspace &ms = m1->at (sx, sy); - /* find_first_free_spot() calls this function. However, often * ob doesn't have any move type (when used to place exits) * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. @@ -446,21 +378,22 @@ * The object 'container' is the object that contains the inventory. * This is needed so that we can update the containers weight. */ - void fix_container (object *container) { object *tmp = container->inv, *next; - container->inv = NULL; - while (tmp != NULL) + container->inv = 0; + while (tmp) { next = tmp->below; if (tmp->inv) fix_container (tmp); - (void) insert_ob_in_ob (tmp, container); + + insert_ob_in_ob (tmp, container); tmp = next; } + /* sum_weight will go through and calculate what all the containers are * carrying. */ @@ -473,46 +406,51 @@ * they are saved). We do have to look for the old maps that did save * the more sections and not re-add sections for them. */ -static void -link_multipart_objects (maptile *m) +void +maptile::link_multipart_objects () { - int x, y; - object *tmp, *op, *last, *above; - archetype *at; - - for (x = 0; x < m->width; x++) - for (y = 0; y < m->height; y++) - for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) - { - above = tmp->above; + if (!spaces) + return; - /* already multipart - don't do anything more */ - if (tmp->head || tmp->more) - continue; + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + for (object *tmp = ms->bot; tmp; ) + { + object *above = tmp->above; - /* If there is nothing more to this object, this for loop - * won't do anything. - */ - for (at = tmp->arch->more, last = tmp; at != NULL; at = at->more, last = op) - { - op = arch_to_object (at); + /* already multipart - don't do anything more */ + if (!tmp->head && !tmp->more) + { + /* If there is nothing more to this object, this for loop + * won't do anything. + */ + archetype *at; + object *last, *op; + for (at = tmp->arch->more, last = tmp; + at; + at = at->more, last = op) + { + op = arch_to_object (at); - /* update x,y coordinates */ - op->x += tmp->x; - op->y += tmp->y; - op->head = tmp; - op->map = m; - last->more = op; - op->name = tmp->name; - op->title = tmp->title; - /* we could link all the parts onto tmp, and then just - * call insert_ob_in_map once, but the effect is the same, - * as insert_ob_in_map will call itself with each part, and - * the coding is simpler to just to it here with each part. - */ - insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); - } /* for at = tmp->arch->more */ - } /* for objects on this space */ + /* update x,y coordinates */ + op->x += tmp->x; + op->y += tmp->y; + op->head = tmp; + op->map = this; + last->more = op; + op->name = tmp->name; + op->title = tmp->title; + + /* we could link all the parts onto tmp, and then just + * call insert_ob_in_map once, but the effect is the same, + * as insert_ob_in_map will call itself with each part, and + * the coding is simpler to just to it here with each part. + */ + insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); + } + } + + tmp = above; + } } /* @@ -520,17 +458,16 @@ * file pointer. * mapflags is the same as we get with load_original_map */ -void -load_objects (maptile *m, object_thawer & fp, int mapflags) +bool +maptile::load_objects (object_thawer &thawer) { - int i, j; int unique; object *op, *prev = NULL, *last_more = NULL, *otmp; op = object::create (); - op->map = m; /* To handle buttons correctly */ + op->map = this; /* To handle buttons correctly */ - while ((i = load_object (fp, op, mapflags))) + while (int i = load_object (thawer, op, 0)) { /* if the archetype for the object is null, means that we * got an invalid object. Don't do anything with it - the game @@ -545,11 +482,7 @@ switch (i) { case LL_NORMAL: - /* if we are loading an overlay, put the floors on the bottom */ - if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) - insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); - else - insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); + insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); if (op->inv) sum_weight (op); @@ -558,70 +491,123 @@ break; case LL_MORE: - insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); + insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); op->head = prev, last_more->more = op, last_more = op; break; } - if (mapflags & MAP_STYLE) - remove_from_active_list (op); - op = object::create (); - op->map = m; + op->map = this; } - for (i = 0; i < m->width; i++) + op->destroy (); + +#if 0 + for (i = 0; i < width; i++) + for (j = 0; j < height; j++) + { + unique = 0; + /* check for unique items, or unique squares */ + for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) + { + if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) + unique = 1; + + if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) + SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); + } + } +#endif + + return true; +} + +void +maptile::activate () +{ + if (!spaces) + return; + + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + for (object *op = ms->bot; op; op = op->above) + op->activate (1); +} + +void +maptile::deactivate () +{ + if (!spaces) + return; + + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + for (object *op = ms->bot; op; op = op->above) + op->deactivate (1); +} + +bool +maptile::save_objects (object_freezer &freezer, int flags) +{ + if (flags & IO_HEADER) + save_header (freezer); + + if (!spaces) + return false; + + for (int i = 0; i < size (); ++i) { - for (j = 0; j < m->height; j++) + int unique = 0; + for (object *op = spaces [i].bot; op; op = op->above) { - unique = 0; - /* check for unique items, or unique squares */ - for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above) - { - if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL)) - unique = 1; + if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) + unique = 1; + + if (!op->can_map_save ()) + continue; - if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique)) - SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); + if (unique || op->flag [FLAG_UNIQUE]) + { + if (flags & IO_UNIQUES) + save_object (freezer, op, 1); } + else if (flags & IO_OBJECTS) + save_object (freezer, op, 1); } } - op->destroy (); - link_multipart_objects (m); + return true; } -/* This saves all the objects on the map in a non destructive fashion. - * Modified by MSW 2001-07-01 to do in a single pass - reduces code, - * and we only save the head of multi part objects - this is needed - * in order to do map tiling properly. - */ -void -save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag) +bool +maptile::load_objects (const char *path, bool skip_header) { - int i, j = 0, unique = 0; - object *op; + object_thawer thawer (path); - /* first pass - save one-part objects */ - for (i = 0; i < m->width; i++) - for (j = 0; j < m->height; j++) - { - unique = 0; + if (!thawer) + return false; - for (op = m->at (i, j).bot; op; op = op->above) - { - if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) - unique = 1; + if (skip_header) + for (;;) + { + keyword kw = thawer.get_kv (); - if (!op->can_map_save ()) - continue; + if (kw == KW_end) + break; - if (unique || op->flag [FLAG_UNIQUE]) - save_object (fp2, op, 1); - else if (flag == 0 || (flag == 2 && (!op->flag [FLAG_OBJ_ORIGINAL] && !op->flag [FLAG_UNPAID]))) - save_object (fp, op, 1); - } + thawer.skip_kv (kw); } + + return load_objects (thawer); +} + +bool +maptile::save_objects (const char *path, int flags) +{ + object_freezer freezer; + + if (!save_objects (freezer, flags)) + return false; + + return freezer.save (path); } maptile::maptile () @@ -637,47 +623,20 @@ timeout = 300; enter_x = 0; enter_y = 0; - /*set part to -1 indicating conversion to weather map not yet done */ - worldpartx = -1; - worldparty = -1; -} - -void -maptile::link () -{ - next = first_map; - first_map = this; } -void -maptile::unlink () +maptile::maptile (int w, int h) { - if (first_map == this) - first_map = next; - else - { - for_all_maps (m) - if (m->next = this) - { - m->next = next; - return; - } + in_memory = MAP_SWAPPED; - LOG (llevError, "maptile::unlink() map not on list: %s\n", path); - } -} + width = w; + height = h; + reset_timeout = 0; + timeout = 300; + enter_x = 0; + enter_y = 0; -/* - * Allocates, initialises, and returns a pointer to a maptile. - * Modified to no longer take a path option which was not being - * used anyways. MSW 2001-07-01 - */ -maptile * -get_linked_map (void) -{ - maptile *map = new maptile; - map->link (); - return map; + alloc (); } /* @@ -686,40 +645,14 @@ * map. */ void -maptile::allocate () +maptile::alloc () { - in_memory = MAP_IN_MEMORY; - - /* Log this condition and free the storage. We could I suppose - * realloc, but if the caller is presuming the data will be intact, - * that is their poor assumption. - */ if (spaces) - { - LOG (llevError, "allocate_map called with already allocated map (%s)\n", path); - sfree (spaces, size ()); - } + return; spaces = salloc0 (size ()); } -/* Create and returns a map of the specific size. Used - * in random map code and the editor. - */ -maptile * -get_empty_map (int sizex, int sizey) -{ - maptile *m = get_linked_map (); - - m->width = sizex; - m->height = sizey; - m->in_memory = MAP_SWAPPED; - - m->allocate (); - - return m; -} - /* Takes a string from a map definition and outputs a pointer to the array of shopitems * corresponding to that string. Memory is allocated for this, it must be freed * at a later date. @@ -843,670 +776,241 @@ * This could be done in lex (like the object loader), but I think * currently, there are few enough fields this is not a big deal. * MSW 2001-07-01 - * return 0 on success, 1 on failure. */ - -static int -load_map_header (object_thawer & fp, maptile *m) +bool +maptile::load_header (object_thawer &thawer) { char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; int msgpos = 0; int maplorepos = 0; - while (fgets (buf, HUGE_BUF, fp) != NULL) + for (;;) { - buf[HUGE_BUF - 1] = 0; - key = buf; - - while (isspace (*key)) - key++; + keyword kw = thawer.get_kv (); - if (*key == 0) - continue; /* empty line */ - - value = strchr (key, ' '); - - if (!value) - { - if ((end = strchr (key, '\n'))) - *end = 0; - } - else + switch (kw) { - *value = 0; - value++; - end = strchr (value, '\n'); + case KW_EOF: + LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); + return false; - while (isspace (*value)) - { - value++; + case KW_end: + return true; - if (*value == '\0' || value == end) - { - /* Nothing but spaces. */ - value = NULL; - break; - } - } - } - - if (!end) - { - LOG (llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf); - return 1; - } - - /* key is the field name, value is what it should be set - * to. We've already done the work to null terminate key, - * and strip off any leading spaces for both of these. - * We have not touched the newline at the end of the line - - * these are needed for some values. the end pointer - * points to the first of the newlines. - * value could be NULL! It would be easy enough to just point - * this to "" to prevent cores, but that would let more errors slide - * through. - * - * First check for entries that do not use the value parameter, then - * validate that value is given and check for the remaining entries - * that use the parameter. - */ - - if (!strcmp (key, "msg")) - { - while (fgets (buf, HUGE_BUF, fp) != NULL) - { - if (!strcmp (buf, "endmsg\n")) - break; - else - { - /* slightly more efficient than strcat */ - strcpy (msgbuf + msgpos, buf); - msgpos += strlen (buf); - } - } - /* There are lots of maps that have empty messages (eg, msg/endmsg - * with nothing between). There is no reason in those cases to - * keep the empty message. Also, msgbuf contains garbage data - * when msgpos is zero, so copying it results in crashes - */ - if (msgpos != 0) - m->msg = strdup (msgbuf); - } - else if (!strcmp (key, "maplore")) - { - while (fgets (buf, HUGE_BUF, fp) != NULL) - { - if (!strcmp (buf, "endmaplore\n")) - break; - else - { - /* slightly more efficient than strcat */ - strcpy (maplorebuf + maplorepos, buf); - maplorepos += strlen (buf); - } - } - if (maplorepos != 0) - m->maplore = strdup (maplorebuf); - } - else if (!strcmp (key, "end")) - { - break; - } - else if (value == NULL) - { - LOG (llevError, "Got '%s' line without parameter in map header\n", key); - } - else if (!strcmp (key, "arch")) - { - /* This is an oddity, but not something we care about much. */ - if (strcmp (value, "map\n")) - LOG (llevError, "loading map and got a non 'arch map' line(%s %s)?\n", key, value); - } - else if (!strcmp (key, "name")) - { - *end = 0; - m->name = strdup (value); - } - /* first strcmp value on these are old names supported - * for compatibility reasons. The new values (second) are - * what really should be used. - */ - else if (!strcmp (key, "oid")) - fp.get (m, atoi (value)); - else if (!strcmp (key, "attach")) - m->attach = value; - else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) - m->enter_x = atoi (value); - else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) - m->enter_y = atoi (value); - else if (!strcmp (key, "x") || !strcmp (key, "width")) - m->width = atoi (value); - else if (!strcmp (key, "y") || !strcmp (key, "height")) - m->height = atoi (value); - else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) - m->reset_timeout = atoi (value); - else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) - m->timeout = atoi (value); - else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) - m->difficulty = clamp (atoi (value), 1, settings.max_level); - else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) - m->darkness = atoi (value); - else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) - m->fixed_resettime = atoi (value); - else if (!strcmp (key, "unique")) - m->unique = atoi (value); - else if (!strcmp (key, "template")) - m->templatemap = atoi (value); - else if (!strcmp (key, "region")) - m->region = get_region_by_name (value); - else if (!strcmp (key, "shopitems")) - { - *end = 0; - m->shopitems = parse_shop_string (value); - } - else if (!strcmp (key, "shopgreed")) - m->shopgreed = atof (value); - else if (!strcmp (key, "shopmin")) - m->shopmin = atol (value); - else if (!strcmp (key, "shopmax")) - m->shopmax = atol (value); - else if (!strcmp (key, "shoprace")) - { - *end = 0; - m->shoprace = strdup (value); - } - else if (!strcmp (key, "outdoor")) - m->outdoor = atoi (value); - else if (!strcmp (key, "temp")) - m->temp = atoi (value); - else if (!strcmp (key, "pressure")) - m->pressure = atoi (value); - else if (!strcmp (key, "humid")) - m->humid = atoi (value); - else if (!strcmp (key, "windspeed")) - m->windspeed = atoi (value); - else if (!strcmp (key, "winddir")) - m->winddir = atoi (value); - else if (!strcmp (key, "sky")) - m->sky = atoi (value); - else if (!strcmp (key, "nosmooth")) - m->nosmooth = atoi (value); - else if (!strncmp (key, "tile_path_", 10)) - { - int tile = atoi (key + 10); + case KW_msg: + thawer.get_ml (KW_endmsg, msg); + break; - if (tile < 1 || tile > 4) - { - LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path); - } - else - { - char *path; + case KW_lore: // CF+ extension + thawer.get_ml (KW_endlore, maplore); + break; - *end = 0; + case KW_maplore: + thawer.get_ml (KW_endmaplore, maplore); + break; - if (m->tile_path[tile - 1]) - { - LOG (llevError, "load_map_header: tile location %d duplicated (%s)\n", tile, m->path); - free (m->tile_path[tile - 1]); - m->tile_path[tile - 1] = NULL; - } + case KW_arch: + if (strcmp (thawer.get_str (), "map")) + LOG (llevError, "%s: loading map and got a non 'arch map' line (arch %s), skipping.\n", &path, thawer.get_str ()); + break; - if (check_path (value, 1) != -1) - { - /* The unadorned path works. */ - path = value; - } - else - { - /* Try again; it could be a relative exit. */ + case KW_oid: + thawer.get (this, thawer.get_sint32 ()); + break; - path = path_combine_and_normalize (m->path, value); + case KW_file_format_version: break; // nop - if (check_path (path, 1) == -1) - { - LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); - path = NULL; - } - } + case KW_name: thawer.get (name); break; + case KW_attach: thawer.get (attach); break; + case KW_reset_time: thawer.get (reset_time); break; + case KW_shopgreed: thawer.get (shopgreed); break; + case KW_shopmin: thawer.get (shopmin); break; + case KW_shopmax: thawer.get (shopmax); break; + case KW_shoprace: thawer.get (shoprace); break; + case KW_outdoor: thawer.get (outdoor); break; + case KW_temp: thawer.get (temp); break; + case KW_pressure: thawer.get (pressure); break; + case KW_humid: thawer.get (humid); break; + case KW_windspeed: thawer.get (windspeed); break; + case KW_winddir: thawer.get (winddir); break; + case KW_sky: thawer.get (sky); break; + + case KW_per_player: thawer.get (per_player); break; + case KW_per_party: thawer.get (per_party); break; + + case KW_region: get_region_by_name (thawer.get_str ()); break; + case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; + + // old names new names + case KW_hp: case KW_enter_x: thawer.get (enter_x); break; + case KW_sp: case KW_enter_y: thawer.get (enter_y); break; + case KW_x: case KW_width: thawer.get (width); break; + case KW_y: case KW_height: thawer.get (height); break; + case KW_weight: case KW_reset_timeout: thawer.get (reset_timeout); break; + case KW_value: case KW_swap_time: thawer.get (timeout); break; + case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break; + case KW_invisible: case KW_darkness: thawer.get (darkness); break; + case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break; + + case KW_tile_path_1: thawer.get (tile_path [0]); break; + case KW_tile_path_2: thawer.get (tile_path [1]); break; + case KW_tile_path_3: thawer.get (tile_path [2]); break; + case KW_tile_path_4: thawer.get (tile_path [3]); break; - if (editor) - { - /* Use the value as in the file. */ - m->tile_path[tile - 1] = strdup (value); - } - else if (path != NULL) - { - /* Use the normalized value. */ - m->tile_path[tile - 1] = strdup (path); - } - } /* end if tile direction (in)valid */ + default: + LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); + break; } - else - LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); } - if (!key || strcmp (key, "end")) - { - LOG (llevError, "Got premature eof on map header!\n"); - return 1; - } - - return 0; + abort (); } -/* - * Opens the file "filename" and reads information about the map - * from the given file, and stores it in a newly allocated - * maptile. A pointer to this structure is returned, or NULL on failure. - * flags correspond to those in map.h. Main ones used are - * MAP_PLAYER_UNIQUE, in which case we don't do any name changes, and - * MAP_BLOCK, in which case we block on this load. This happens in all - * cases, no matter if this flag is set or not. - * MAP_STYLE: style map - don't add active objects, don't add to server - * managed map list. - */ -maptile * -load_original_map (const char *filename, int flags) +bool +maptile::load_header (const char *path) { - maptile *m; - char pathname[MAX_BUF]; - - if (flags & MAP_PLAYER_UNIQUE) - strcpy (pathname, filename); - else if (flags & MAP_OVERLAY) - strcpy (pathname, create_overlay_pathname (filename)); - else - strcpy (pathname, create_pathname (filename)); - - LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname); - - object_thawer thawer (pathname); + object_thawer thawer (path); if (!thawer) - return 0; - - m = get_linked_map (); + return false; - strcpy (m->path, filename); - if (load_map_header (thawer, m)) - { - LOG (llevError, "Error loading map header for %s, flags=%d\n", filename, flags); - delete_map (m); - return 0; - } - - m->allocate (); - - m->in_memory = MAP_LOADING; - load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); - - m->in_memory = MAP_IN_MEMORY; - if (!m->difficulty) - m->difficulty = calculate_difficulty (m); - set_map_reset_time (m); - m->instantiate (); - return (m); + return load_header (thawer); } -/* - * Loads a map, which has been loaded earlier, from file. - * Return the map object we load into (this can change from the passed - * option if we can't find the original map) - */ -static maptile * -load_temporary_map (maptile *m) -{ - char buf[MAX_BUF]; +/****************************************************************************** + * This is the start of unique map handling code + *****************************************************************************/ - if (!m->tmpname) +/* This goes through the maptile and removed any unique items on the map. */ +void +maptile::clear_unique_items () +{ + for (int i = 0; i < size (); ++i) { - LOG (llevError, "No temporary filename for map %s\n", m->path); - strcpy (buf, m->path); - delete_map (m); - m = load_original_map (buf, 0); - if (m == NULL) - return NULL; - fix_auto_apply (m); /* Chests which open as default */ - return m; - } + int unique = 0; + for (object *op = spaces [i].bot; op; ) + { + object *above = op->above; - object_thawer thawer (m->tmpname); + if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) + unique = 1; - if (!thawer) - { - strcpy (buf, m->path); - delete_map (m); - m = load_original_map (buf, 0); - if (!m) - return NULL; - fix_auto_apply (m); /* Chests which open as default */ - return m; - } + if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) + { + op->destroy_inv (false); + op->destroy (); + } - if (load_map_header (thawer, m)) - { - LOG (llevError, "Error loading map header for %s (%s)\n", m->path, m->tmpname); - delete_map (m); - m = load_original_map (m->path, 0); - return NULL; + op = above; + } } - - m->allocate (); - - m->in_memory = MAP_LOADING; - load_objects (m, thawer, 0); - - m->in_memory = MAP_IN_MEMORY; - INVOKE_MAP (SWAPIN, m); - return m; } -/* - * Loads a map, which has been loaded earlier, from file. - * Return the map object we load into (this can change from the passed - * option if we can't find the original map) - */ -maptile * -load_overlay_map (const char *filename, maptile *m) +bool +maptile::save_header (object_freezer &freezer) { - char pathname[MAX_BUF]; +#define MAP_OUT(k) freezer.put (KW_ ## k, k) +#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) - strcpy (pathname, create_overlay_pathname (filename)); + MAP_OUT2 (arch, "map"); - object_thawer thawer (pathname); + if (name) MAP_OUT (name); + MAP_OUT (swap_time); + MAP_OUT (reset_time); + MAP_OUT (reset_timeout); + MAP_OUT (fixed_resettime); + MAP_OUT (difficulty); - if (!thawer) - return m; + if (region) MAP_OUT2 (region, region->name); - if (load_map_header (thawer, m)) + if (shopitems) { - LOG (llevError, "Error loading map header for overlay %s (%s)\n", m->path, pathname); - delete_map (m); - m = load_original_map (m->path, 0); - return 0; + char shop[MAX_BUF]; + print_shop_string (this, shop); + MAP_OUT2 (shopitems, shop); } - /*m->allocate ();*/ - m->in_memory = MAP_LOADING; - load_objects (m, thawer, MAP_OVERLAY); + MAP_OUT (shopgreed); + MAP_OUT (shopmin); + MAP_OUT (shopmax); + if (shoprace) MAP_OUT (shoprace); + MAP_OUT (darkness); + MAP_OUT (width); + MAP_OUT (height); + MAP_OUT (enter_x); + MAP_OUT (enter_y); - m->in_memory = MAP_IN_MEMORY; - return m; -} + if (msg) freezer.put (KW_msg , KW_endmsg , msg); + if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore); -/****************************************************************************** - * This is the start of unique map handling code - *****************************************************************************/ + MAP_OUT (outdoor); + MAP_OUT (temp); + MAP_OUT (pressure); + MAP_OUT (humid); + MAP_OUT (windspeed); + MAP_OUT (winddir); + MAP_OUT (sky); -/* This goes through map 'm' and removed any unique items on the map. */ -static void -delete_unique_items (maptile *m) -{ - int i, j, unique; - object *op, *next; + MAP_OUT (per_player); + MAP_OUT (per_party); - for (i = 0; i < m->width; i++) - for (j = 0; j < m->height; j++) - { - unique = 0; + if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); + if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); + if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); + if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); - for (op = GET_MAP_OB (m, i, j); op; op = next) - { - next = op->above; + MAP_OUT2 (end, 0); - if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) - unique = 1; - - if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) - { - op->destroy_inv (false); - op->destroy (); - } - } - } + return true; } -/* - * Loads unique objects from file(s) into the map which is in memory - * m is the map to load unique items into. - */ -static void -load_unique_objects (maptile *m) +bool +maptile::save_header (const char *path) { - int count; - char firstname[MAX_BUF]; - - for (count = 0; count < 10; count++) - { - sprintf (firstname, "%s.v%02d", create_items_path (m->path), count); - if (!access (firstname, R_OK)) - break; - } - /* If we get here, we did not find any map */ - if (count == 10) - return; - - object_thawer thawer (firstname); - - if (!thawer) - return; - - m->in_memory = MAP_LOADING; - if (m->tmpname == NULL) /* if we have loaded unique items from */ - delete_unique_items (m); /* original map before, don't duplicate them */ - - load_objects (m, thawer, 0); - - m->in_memory = MAP_IN_MEMORY; -} - -/* - * Saves a map to file. If flag is set, it is saved into the same - * file it was (originally) loaded from. Otherwise a temporary - * filename will be genarated, and the file will be stored there. - * The temporary filename will be stored in the maptileure. - * If the map is unique, we also save to the filename in the map - * (this should have been updated when first loaded) - */ -int -new_save_map (maptile *m, int flag) -{ - char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; - int i; - - if (flag && !*m->path) - { - LOG (llevError, "Tried to save map without path.\n"); - return -1; - } - - if (flag || (m->unique) || (m->templatemap)) - { - if (!m->unique && !m->templatemap) - { /* flag is set */ - if (flag == 2) - strcpy (filename, create_overlay_pathname (m->path)); - else - strcpy (filename, create_pathname (m->path)); - } - else - strcpy (filename, m->path); - - make_path_to_file (filename); - } - else - { - if (!m->tmpname) - m->tmpname = tempnam (settings.tmpdir, NULL); - - strcpy (filename, m->tmpname); - } - - LOG (llevDebug, "Saving map %s to %s\n", m->path, filename); - m->in_memory = MAP_SAVING; - object_freezer freezer; - /* legacy */ - fprintf (freezer, "arch map\n"); - if (m->name) - fprintf (freezer, "name %s\n", m->name); - if (!flag) - fprintf (freezer, "swap_time %d\n", m->swap_time); - if (m->reset_timeout) - fprintf (freezer, "reset_timeout %d\n", m->reset_timeout); - if (m->fixed_resettime) - fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime); - /* we unfortunately have no idea if this is a value the creator set - * or a difficulty value we generated when the map was first loaded - */ - if (m->difficulty) - fprintf (freezer, "difficulty %d\n", m->difficulty); - if (m->region) - fprintf (freezer, "region %s\n", m->region->name); - if (m->shopitems) - { - print_shop_string (m, shop); - fprintf (freezer, "shopitems %s\n", shop); - } - if (m->shopgreed) - fprintf (freezer, "shopgreed %f\n", m->shopgreed); - if (m->shopmin) - fprintf (freezer, "shopmin %llu\n", m->shopmin); - if (m->shopmax) - fprintf (freezer, "shopmax %llu\n", m->shopmax); - if (m->shoprace) - fprintf (freezer, "shoprace %s\n", m->shoprace); - if (m->darkness) - fprintf (freezer, "darkness %d\n", m->darkness); - if (m->width) - fprintf (freezer, "width %d\n", m->width); - if (m->height) - fprintf (freezer, "height %d\n", m->height); - if (m->enter_x) - fprintf (freezer, "enter_x %d\n", m->enter_x); - if (m->enter_y) - fprintf (freezer, "enter_y %d\n", m->enter_y); - if (m->msg) - fprintf (freezer, "msg\n%sendmsg\n", m->msg); - if (m->maplore) - fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore); - if (m->unique) - fprintf (freezer, "unique %d\n", m->unique); - if (m->templatemap) - fprintf (freezer, "template %d\n", m->templatemap); - if (m->outdoor) - fprintf (freezer, "outdoor %d\n", m->outdoor); - if (m->temp) - fprintf (freezer, "temp %d\n", m->temp); - if (m->pressure) - fprintf (freezer, "pressure %d\n", m->pressure); - if (m->humid) - fprintf (freezer, "humid %d\n", m->humid); - if (m->windspeed) - fprintf (freezer, "windspeed %d\n", m->windspeed); - if (m->winddir) - fprintf (freezer, "winddir %d\n", m->winddir); - if (m->sky) - fprintf (freezer, "sky %d\n", m->sky); - if (m->nosmooth) - fprintf (freezer, "nosmooth %d\n", m->nosmooth); - - /* Save any tiling information, except on overlays */ - if (flag != 2) - for (i = 0; i < 4; i++) - if (m->tile_path[i]) - fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]); - - freezer.put (m); - fprintf (freezer, "end\n"); - - /* In the game save unique items in the different file, but - * in the editor save them to the normal map file. - * If unique map, save files in the proper destination (set by - * player) - */ - if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap) - { - object_freezer unique; + if (!save_header (freezer)) + return false; - if (flag == 2) - save_objects (m, freezer, unique, 2); - else - save_objects (m, freezer, unique, 0); - - sprintf (buf, "%s.v00", create_items_path (m->path)); - - unique.save (buf); - } - else - { /* save same file when not playing, like in editor */ - save_objects (m, freezer, freezer, 0); - } - - freezer.save (filename); - - return 0; + return freezer.save (path); } /* * Remove and free all objects in the given map. */ void -free_all_objects (maptile *m) +maptile::clear () { - if (!m->spaces) + if (!spaces) return; - for (int i = 0; i < m->width; i++) - for (int j = 0; j < m->height; j++) + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + while (object *op = ms->bot) { - mapspace &ms = m->at (i, j); - - while (object *op = ms.bot) - { - if (op->head) - op = op->head; + if (op->head) + op = op->head; - op->destroy_inv (false); - op->destroy (); - } + op->destroy_inv (false); + op->destroy (); } + + sfree (spaces, size ()), spaces = 0; + + if (buttons) + free_objectlinkpt (buttons), buttons = 0; } -/* - * Frees everything allocated by the given maptileure. - * don't free tmpname - our caller is left to do that - */ void -free_map (maptile *m, int flag) +maptile::clear_header () { - if (!m->in_memory) //TODO: makes no sense to me? - return; - - m->in_memory = MAP_SAVING; - - // TODO: use new/delete - - if (flag && m->spaces) - free_all_objects (m); - - sfree (m->spaces, m->size ()), m->spaces = 0; - - free (m->name), m->name = 0; - free (m->msg), m->msg = 0; - free (m->maplore), m->maplore = 0; - free (m->shoprace), m->shoprace = 0; - delete [] m->shopitems, m->shopitems = 0; - - if (m->buttons) - free_objectlinkpt (m->buttons), m->buttons = 0; + name = 0; + msg = 0; + maplore = 0; + shoprace = 0; + delete [] shopitems, shopitems = 0; for (int i = 0; i < 4; i++) - free (m->tile_path[i]), m->tile_path[i] = 0; - - m->in_memory = MAP_SWAPPED; + tile_path [i] = 0; } maptile::~maptile () @@ -1515,142 +1019,50 @@ } void -maptile::do_destroy () +maptile::clear_links_to (maptile *m) { - attachable::do_destroy (); - - unlink (); - - free_map (this, 1); - free (tmpname), tmpname = 0; - /* We need to look through all the maps and see if any maps * are pointing at this one for tiling information. Since * tiling can be asymetric, we just can not look to see which * maps this map tiles with and clears those. */ - //TODO: non-euclidean-tiling MUST GO - for_all_maps (m) - for (int i = 0; i < 4; i++) - if (m->tile_map[i] == this) - m->tile_map[i] = 0; + for (int i = 0; i < 4; i++) + if (tile_map[i] == m) + tile_map[i] = 0; } -//TODO: must go void -delete_map (maptile *m) +maptile::do_destroy () { - if (m) - m->destroy (); + attachable::do_destroy (); + + clear (); } /* - * Makes sure the given map is loaded and swapped in. - * name is path name of the map. - * flags meaning: - * 0x1 (MAP_FLUSH): flush the map - always load from the map directory, - * and don't do unique items or the like. - * 0x2 (MAP_PLAYER_UNIQUE) - this is a unique map for each player. - * dont do any more name translation on it. - * - * Returns a pointer to the given map. + * Updates every button on the map (by calling update_button() for them). */ -maptile * -ready_map_name (const char *name, int flags) +void +maptile::update_buttons () { - if (!name) - return 0; - - /* Have we been at this level before? */ - maptile *m = has_been_loaded (name); - - /* Map is good to go, so just return it */ - if (m && (m->in_memory == MAP_LOADING || m->in_memory == MAP_IN_MEMORY)) - return m; - - /* unique maps always get loaded from their original location, and never - * a temp location. Likewise, if map_flush is set, or we have never loaded - * this map, load it now. I removed the reset checking from here - - * it seems the probability of a player trying to enter a map that should - * reset but hasn't yet is quite low, and removing that makes this function - * a bit cleaner (and players probably shouldn't rely on exact timing for - * resets in any case - if they really care, they should use the 'maps command. - */ - if ((flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE)) || !m) - { - /* first visit or time to reset */ - if (m) - { - clean_tmp_map (m); /* Doesn't make much difference */ - delete_map (m); - } - - /* create and load a map */ - if (flags & MAP_PLAYER_UNIQUE) - LOG (llevDebug, "Trying to load map %s.\n", name); - else - LOG (llevDebug, "Trying to load map %s.\n", create_pathname (name)); - - if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) - return (NULL); - - fix_auto_apply (m); /* Chests which open as default */ - - /* If a player unique map, no extra unique object file to load. - * if from the editor, likewise. - */ - if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE))) - load_unique_objects (m); - - if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY))) - { - m = load_overlay_map (name, m); - if (m == NULL) - return NULL; - } - - if (flags & MAP_PLAYER_UNIQUE) - INVOKE_MAP (SWAPIN, m); - - } - else - { - /* If in this loop, we found a temporary map, so load it up. */ - - m = load_temporary_map (m); - if (m == NULL) - return NULL; - load_unique_objects (m); - - clean_tmp_map (m); - m->in_memory = MAP_IN_MEMORY; - /* tempnam() on sun systems (probably others) uses malloc - * to allocated space for the string. Free it here. - * In some cases, load_temporary_map above won't find the - * temporary map, and so has reloaded a new map. If that - * is the case, tmpname is now null - */ - if (m->tmpname) - free (m->tmpname); - m->tmpname = NULL; - /* It's going to be saved anew anyway */ - } - - /* Below here is stuff common to both first time loaded maps and - * temp maps. - */ + for (oblinkpt *obp = buttons; obp; obp = obp->next) + for (objectlink *ol = obp->link; ol; ol = ol->next) + { + if (!ol->ob) + { + LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n", + ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value); + continue; + } - decay_objects (m); /* start the decay */ - /* In case other objects press some buttons down */ - update_buttons (m); - if (m->outdoor) - set_darkness_map (m); - /* run the weather over this map */ - weather_effect (name); - return m; + if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL) + { + update_button (ol->ob); + break; + } + } } - /* * This routine is supposed to find out the difficulty of the map. * difficulty does not have a lot to do with character level, @@ -1661,87 +1073,42 @@ * have a difficulty set than using this function - human calculation * is much better than this functions guesswork. */ - int -calculate_difficulty (maptile *m) +maptile::estimate_difficulty () const { - object *op; - archetype *at; - int x, y, i; long monster_cnt = 0; double avgexp = 0; sint64 total_exp = 0; - if (m->difficulty) - { - LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty); - return m->difficulty; - } - - for (x = 0; x < m->width; x++) - for (y = 0; y < m->height; y++) - for (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) - { - if (QUERY_FLAG (op, FLAG_MONSTER)) - { - total_exp += op->stats.exp; - monster_cnt++; - } + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + for (object *op = ms->bot; op; op = op->above) + { + if (QUERY_FLAG (op, FLAG_MONSTER)) + { + total_exp += op->stats.exp; + monster_cnt++; + } - if (QUERY_FLAG (op, FLAG_GENERATOR)) - { - total_exp += op->stats.exp; - at = type_to_archetype (GENERATE_TYPE (op)); + if (QUERY_FLAG (op, FLAG_GENERATOR)) + { + total_exp += op->stats.exp; - if (at != NULL) - total_exp += at->clone.stats.exp * 8; + if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) + total_exp += at->clone.stats.exp * 8; - monster_cnt++; - } - } + monster_cnt++; + } + } avgexp = (double) total_exp / monster_cnt; - for (i = 1; i <= settings.max_level; i++) - { - if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) - { - /* LOG(llevDebug, "Calculated difficulty for map: %s: %d\n", m->name, i); */ - return i; - } - } + for (int i = 1; i <= settings.max_level; i++) + if ((level_exp (i, 1) - level_exp (i - 1, 1)) > (100 * avgexp)) + return i; return 1; } -void -clean_tmp_map (maptile *m) -{ - if (m->tmpname == NULL) - return; - INVOKE_MAP (CLEAN, m); - (void) unlink (m->tmpname); -} - -void -free_all_maps (void) -{ - int real_maps = 0; - - while (first_map) - { - /* I think some of the callers above before it gets here set this to be - * saving, but we still want to free this data - */ - if (first_map->in_memory == MAP_SAVING) - first_map->in_memory = MAP_IN_MEMORY; - delete_map (first_map); - real_maps++; - } - - LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); -} - /* change_map_light() - used to change map light level (darkness) * up or down. Returns true if successful. It should now be * possible to change a value by more than 1. @@ -1749,38 +1116,35 @@ * to maps than los. * postive values make it darker, negative make it brighter */ - int -change_map_light (maptile *m, int change) +maptile::change_map_light (int change) { - int new_level = m->darkness + change; + int new_level = darkness + change; /* Nothing to do */ - if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->darkness >= MAX_DARKNESS)) - { - return 0; - } + if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) + return 0; /* inform all players on the map */ if (change > 0) - new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); + new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); else - new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); + new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); - /* Do extra checking. since m->darkness is a unsigned value, + /* Do extra checking. since darkness is a unsigned value, * we need to be extra careful about negative values. * In general, the checks below are only needed if change * is not +/-1 */ if (new_level < 0) - m->darkness = 0; + darkness = 0; else if (new_level >= MAX_DARKNESS) - m->darkness = MAX_DARKNESS; + darkness = MAX_DARKNESS; else - m->darkness = new_level; + darkness = new_level; /* All clients need to get re-updated for the change */ - update_all_map_los (m); + update_all_map_los (this); return 1; } @@ -1981,20 +1345,21 @@ * the value of orig_map->tile_map[tile_num]. It really only does this * so that it is easier for calling functions to verify success. */ - static maptile * load_and_link_tiled_map (maptile *orig_map, int tile_num) { + maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); + mp->load (); + int dest_tile = (tile_num + 2) % 4; - char *path = path_combine_and_normalize (orig_map->path, orig_map->tile_path[tile_num]); - orig_map->tile_map[tile_num] = ready_map_name (path, 0); + orig_map->tile_map[tile_num] = mp; /* need to do a strcmp here as the orig_map->path is not a shared string */ - if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && !strcmp (orig_map->tile_map[tile_num]->tile_path[dest_tile], orig_map->path)) + if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && 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; - return orig_map->tile_map[tile_num]; + return mp; } /* this returns TRUE if the coordinates (x,y) are out of @@ -2004,8 +1369,6 @@ * necessary to check for valid coordinates. * This function will recursively call itself for the * tiled maps. - * - * */ int out_of_map (maptile *m, int x, int y) @@ -2025,7 +1388,7 @@ if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) load_and_link_tiled_map (m, 3); - return (out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y)); + return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); } if (x >= m->width) @@ -2036,7 +1399,7 @@ if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) load_and_link_tiled_map (m, 1); - return (out_of_map (m->tile_map[1], x - m->width, y)); + return out_of_map (m->tile_map[1], x - m->width, y); } if (y < 0) @@ -2047,7 +1410,7 @@ if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) load_and_link_tiled_map (m, 0); - return (out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height)); + return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); } if (y >= m->height) @@ -2058,7 +1421,7 @@ if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) load_and_link_tiled_map (m, 2); - return (out_of_map (m->tile_map[2], x, y - m->height)); + return out_of_map (m->tile_map[2], x, y - m->height); } /* Simple case - coordinates are within this local @@ -2076,13 +1439,13 @@ * and then figuring out what the real map is */ maptile * -get_map_from_coord (maptile *m, sint16 * x, sint16 * y) +get_map_from_coord (maptile *m, sint16 *x, sint16 *y) { - if (*x < 0) { if (!m->tile_path[3]) return 0; + if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) load_and_link_tiled_map (m, 3); @@ -2130,6 +1493,7 @@ * map. */ + m->last_access = runtime; return m; } @@ -2147,7 +1511,6 @@ { *dx = 0; *dy = 0; - } else if (map1->tile_map[0] == map2) { /* up */ @@ -2168,7 +1531,6 @@ { /* left */ *dx = -map2->width; *dy = 0; - } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) { /* up right */ @@ -2209,12 +1571,9 @@ { /* left down */ *dx = -map1->tile_map[3]->width; *dy = map1->tile_map[3]->height; - } else - { /* not "adjacent" enough */ - return 0; - } + return 0; return 1; } @@ -2239,7 +1598,6 @@ * currently, the only flag supported (0x1) is don't translate for * closest body part of 'op1' */ - void get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) { @@ -2330,7 +1688,7 @@ /* Returns true of op1 and op2 are effectively on the same map * (as related to map tiling). Note that this looks for a path from - * op1 to op2, so if the tiled maps are assymetric and op2 has a path + * op1 to op2, so if the tiled maps are asymetric and op2 has a path * to op1, this will still return false. * Note we only look one map out to keep the processing simple * and efficient. This could probably be a macro.