--- deliantra/server/common/map.C 2006/08/31 18:59:23 1.19 +++ deliantra/server/common/map.C 2006/12/25 17:11:16 1.51 @@ -1,9 +1,4 @@ /* - * static char *rcsid_map_c = - * "$Id: map.C,v 1.19 2006/08/31 18:59:23 root Exp $"; - */ - -/* CrossFire, A Multiplayer game for X-windows Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team @@ -23,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - The authors can be reached via e-mail at crossfire-devel@real-time.com + The authors can be reached via e-mail at */ @@ -31,29 +26,27 @@ #include #include -#ifndef WIN32 /* ---win32 exclude header */ #include -#endif /* win32 */ #include "path.h" - -extern int nrofallocobjects,nroffreeobjects; - /* - * Returns the mapstruct which has a name matching the given argument. + * 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) +{ + maptile *map; -mapstruct *has_been_loaded (const char *name) { - mapstruct *map; + if (!name || !*name) + return 0; - if (!name || !*name) - return 0; - for (map = first_map; map; map = map->next) - if (!strcmp (name, map->path)) - break; - return (map); + for (map = first_map; map; map = map->next) + if (!strcmp (name, map->path)) + break; + + return (map); } /* @@ -63,51 +56,57 @@ * it really should be called create_mapname */ -const char *create_pathname (const char *name) { - static char buf[MAX_BUF]; +const char * +create_pathname (const char *name) +{ + static char buf[MAX_BUF]; - /* Why? having extra / doesn't confuse unix anyplace? Dependancies - * someplace else in the code? msw 2-17-97 - */ - if (*name == '/') - sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name); - else - sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); - return (buf); + /* Why? having extra / doesn't confuse unix anyplace? Dependancies + * someplace else in the code? msw 2-17-97 + */ + if (*name == '/') + sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name); + else + sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); + return (buf); } /* * same as create_pathname, but for the overlay maps. */ -const char *create_overlay_pathname (const char *name) { - static char buf[MAX_BUF]; +const char * +create_overlay_pathname (const char *name) +{ + static char buf[MAX_BUF]; - /* Why? having extra / doesn't confuse unix anyplace? Dependancies - * someplace else in the code? msw 2-17-97 - */ - if (*name == '/') - sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name); - else - sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name); - return (buf); + /* Why? having extra / doesn't confuse unix anyplace? Dependancies + * someplace else in the code? msw 2-17-97 + */ + if (*name == '/') + sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name); + else + sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name); + return (buf); } /* * same as create_pathname, but for the template maps. */ -const char *create_template_pathname (const char *name) { - static char buf[MAX_BUF]; +const char * +create_template_pathname (const char *name) +{ + static char buf[MAX_BUF]; - /* Why? having extra / doesn't confuse unix anyplace? Dependancies - * someplace else in the code? msw 2-17-97 - */ - if (*name == '/') - sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name); - else - sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name); - return (buf); + /* Why? having extra / doesn't confuse unix anyplace? Dependancies + * someplace else in the code? msw 2-17-97 + */ + if (*name == '/') + sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name); + else + sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name); + return (buf); } /* @@ -116,22 +115,24 @@ * files than full directory structure, but if this is problem it can * be changed. */ -static const char *create_items_path (const char *s) { - static char buf[MAX_BUF]; - char *t; - - if (*s == '/') - s++; +static const char * +create_items_path (const char *s) +{ + static char buf[MAX_BUF]; + char *t; - sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir); + if (*s == '/') + s++; - for (t=buf+strlen(buf); *s; s++,t++) - if (*s == '/') - *t = '@'; - else - *t = *s; - *t = 0; - return (buf); + sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir); + + for (t = buf + strlen (buf); *s; s++, t++) + if (*s == '/') + *t = '@'; + else + *t = *s; + *t = 0; + return (buf); } @@ -151,47 +152,41 @@ * that seems to be missing the prepend_dir processing */ -int check_path (const char *name, int prepend_dir) +int +check_path (const char *name, int prepend_dir) { - char buf[MAX_BUF]; -#ifndef WIN32 - char *endbuf; - struct stat statbuf; - int mode = 0, i; -#endif + char buf[MAX_BUF]; - if (prepend_dir) - strcpy (buf, create_pathname(name)); - else - strcpy(buf, name); -#ifdef WIN32 /* ***win32: check this sucker in windows style. */ - return(_access(buf,0)); -#else - - /* 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); + char *endbuf; + struct stat statbuf; + int mode = 0; + + if (prepend_dir) + strcpy (buf, create_pathname (name)); + else + strcpy (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; - 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); -#endif + return (mode); } /* @@ -200,23 +195,23 @@ * necessary to make sure the information is in fact logged. */ -void dump_map(const mapstruct *m) { - LOG(llevError,"Map %s status: %d.\n",m->path,m->in_memory); - LOG(llevError,"Size: %dx%d Start: %d,%d\n", - MAP_WIDTH(m), MAP_HEIGHT(m), - MAP_ENTER_X(m), MAP_ENTER_Y(m)); - - if(m->msg!=NULL) - LOG(llevError,"Message:\n%s",m->msg); +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->maplore != NULL) + LOG (llevError, "Lore:\n%s", m->maplore); - if(m->tmpname!=NULL) - LOG(llevError,"Tmpname: %s\n",m->tmpname); + 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); + LOG (llevError, "Difficulty: %d\n", m->difficulty); + LOG (llevError, "Darkness: %d\n", m->darkness); } /* @@ -225,11 +220,13 @@ * dump_map on each one. */ -void dump_all_maps(void) { - mapstruct *m; - for(m=first_map;m!=NULL;m=m->next) { - dump_map(m); - } +void +dump_all_maps (void) +{ + maptile *m; + + for (m = first_map; m; m = m->next) + dump_map (m); } /* This rolls up wall, blocks_magic, blocks_view, etc, all into @@ -242,29 +239,30 @@ * checking for the existence of something on those spaces, but * don't expect to insert/remove anything from those spaces. */ -int get_map_flags(mapstruct *oldmap, mapstruct **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) +int +get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) { - sint16 newx, newy; - int retval=0; - mapstruct *mp; - - if (out_of_map(oldmap, x, y)) return P_OUT_OF_MAP; - newx = x; - newy = y; - mp = get_map_from_coord(oldmap, &newx, &newy); - if (mp != oldmap) - retval |= P_NEW_MAP; - if (newmap) *newmap = mp; - if (nx) *nx = newx; - if (ny) *ny = newy; - retval |= mp->spaces[newx + mp->width * newy].flags; + sint16 newx, newy; + int retval = 0; + maptile *mp; - if (retval & P_SAFE) - retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these + newx = x; + newy = y; - return retval; -} + 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 (); +} /* * Returns true if the given coordinate is blocked except by the @@ -278,87 +276,98 @@ * the coordinates & map passed in should have been updated for tiling * by the caller. */ +int +blocked_link (object *ob, maptile *m, int sx, int sy) +{ + object *tmp; + int mflags, blocked; -int blocked_link(object *ob, mapstruct *m, int sx, int sy) { - object *tmp; - int mflags, blocked; - - /* Make sure the coordinates are valid - they should be, as caller should - * have already checked this. - */ - if (OUT_OF_REAL_MAP(m, sx, sy)) { - LOG(llevError,"blocked_link: Passed map, x, y coordinates outside of map\n"); - return 1; + /* Make sure the coordinates are valid - they should be, as caller should + * have already checked this. + */ + if (OUT_OF_REAL_MAP (m, sx, sy)) + { + LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); + return 1; } - /* Save some cycles - instead of calling get_map_flags(), just get the value - * directly. - */ - mflags = m->spaces[sx + m->width * sy].flags; - - blocked = GET_MAP_MOVE_BLOCK(m, sx, sy); - - /* If space is currently not blocked by anything, no need to - * go further. Not true for players - all sorts of special - * things we need to do for players. - */ - if (ob->type != PLAYER && ! (mflags & P_IS_ALIVE) && (blocked==0)) return 0; - - /* if there isn't anytyhing alive on this space, and this space isn't - * otherwise blocked, we can return now. Only if there is a living - * creature do we need to investigate if it is part of this creature - * or another. Likewise, only if something is blocking us do we - * need to investigate if there is a special circumstance that would - * let the player through (inventory checkers for example) - */ - if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK(ob, blocked)) return 0; - - if(ob->head != NULL) - ob=ob->head; - - /* We basically go through the stack of objects, and if there is - * some other object that has NO_PASS or FLAG_ALIVE set, return - * true. If we get through the entire stack, that must mean - * ob is blocking it, so return 0. - */ - for(tmp = GET_MAP_OB(m,sx,sy); tmp!= NULL; tmp = tmp->above) { - - /* This must be before the checks below. Code for inventory checkers. */ - if (tmp->type==CHECK_INV && OB_MOVE_BLOCK(ob, tmp)) { - /* If last_sp is set, the player/monster needs an object, - * so we check for it. If they don't have it, they can't - * pass through this space. - */ - if (tmp->last_sp) { - if (check_inv_recursive(ob,tmp)==NULL) - return 1; - else - continue; - } else { - /* In this case, the player must not have the object - - * if they do, they can't pass through. - */ - if (check_inv_recursive(ob,tmp)!=NULL) /* player has object */ - return 1; - else - continue; - } - } /* if check_inv */ - else { - /* Broke apart a big nasty if into several here to make - * this more readable. first check - if the space blocks - * movement, can't move here. - * second - if a monster, can't move there, unles it is a - * hidden dm - */ - if (OB_MOVE_BLOCK(ob, tmp)) return 1; - if (QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->head != ob && tmp != ob && - tmp->type != DOOR && !(QUERY_FLAG(tmp,FLAG_WIZ) && tmp->contr->hidden)) - return 1; + /* Save some cycles - instead of calling get_map_flags(), just get the value + * directly. + */ + mflags = m->at (sx, sy).flags (); + + blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); + + /* If space is currently not blocked by anything, no need to + * go further. Not true for players - all sorts of special + * things we need to do for players. + */ + if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) + return 0; + + /* if there isn't anytyhing alive on this space, and this space isn't + * otherwise blocked, we can return now. Only if there is a living + * creature do we need to investigate if it is part of this creature + * or another. Likewise, only if something is blocking us do we + * need to investigate if there is a special circumstance that would + * let the player through (inventory checkers for example) + */ + if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) + return 0; + + if (ob->head != NULL) + ob = ob->head; + + /* We basically go through the stack of objects, and if there is + * some other object that has NO_PASS or FLAG_ALIVE set, return + * true. If we get through the entire stack, that must mean + * ob is blocking it, so return 0. + */ + for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) + { + + /* This must be before the checks below. Code for inventory checkers. */ + if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp)) + { + /* If last_sp is set, the player/monster needs an object, + * so we check for it. If they don't have it, they can't + * pass through this space. + */ + if (tmp->last_sp) + { + if (check_inv_recursive (ob, tmp) == NULL) + return 1; + else + continue; + } + else + { + /* In this case, the player must not have the object - + * if they do, they can't pass through. + */ + if (check_inv_recursive (ob, tmp) != NULL) /* player has object */ + return 1; + else + continue; + } + } /* if check_inv */ + else + { + /* Broke apart a big nasty if into several here to make + * this more readable. first check - if the space blocks + * movement, can't move here. + * second - if a monster, can't move there, unles it is a + * hidden dm + */ + if (OB_MOVE_BLOCK (ob, tmp)) + return 1; + if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && + tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) + return 1; } } - return 0; + return 0; } @@ -388,42 +397,52 @@ * code, we need to have actual object to check its move_type * against the move_block values. */ +int +ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) +{ + archetype *tmp; + int flag; + maptile *m1; + sint16 sx, sy; -int ob_blocked(const object *ob,mapstruct *m,sint16 x,sint16 y) { - archetype *tmp; - int flag; - mapstruct *m1; - sint16 sx, sy; - - if(ob==NULL) { - flag= get_map_flags(m,&m1, x,y, &sx, &sy); - if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; - - /* don't have object, so don't know what types would block */ - return(GET_MAP_MOVE_BLOCK(m1, sx, sy)); - } - - for(tmp=ob->arch; tmp!=NULL;tmp=tmp->more) { - flag = get_map_flags(m, &m1, x+tmp->clone.x,y+tmp->clone.y, &sx, &sy); - - if (flag & P_OUT_OF_MAP) return P_OUT_OF_MAP; - if (flag & P_IS_ALIVE) return P_IS_ALIVE; - - /* 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. - */ - - if (ob->move_type == 0 && GET_MAP_MOVE_BLOCK(m1, sx, sy) != MOVE_ALL) continue; - - /* Note it is intentional that we check ob - the movement type of the - * head of the object should correspond for the entire object. - */ - if (OB_TYPE_MOVE_BLOCK(ob, GET_MAP_MOVE_BLOCK(m1, sx, sy))) - return AB_NO_PASS; + if (ob == NULL) + { + flag = get_map_flags (m, &m1, x, y, &sx, &sy); + if (flag & P_OUT_OF_MAP) + return P_OUT_OF_MAP; + /* don't have object, so don't know what types would block */ + return m1->at (sx, sy).move_block; } - return 0; + + for (tmp = ob->arch; tmp; tmp = tmp->more) + { + flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); + + if (flag & P_OUT_OF_MAP) + return P_OUT_OF_MAP; + if (flag & P_IS_ALIVE) + return P_IS_ALIVE; + + 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. + */ + + if (ob->move_type == 0 && ms.move_block != MOVE_ALL) + continue; + + /* Note it is intentional that we check ob - the movement type of the + * head of the object should correspond for the entire object. + */ + if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) + return P_NO_PASS; + } + + return 0; } /* When the map is loaded, load_object does not actually insert objects @@ -433,22 +452,24 @@ * This is needed so that we can update the containers weight. */ -void fix_container(object *container) +void +fix_container (object *container) { - object *tmp=container->inv, *next; + object *tmp = container->inv, *next; - container->inv=NULL; - while (tmp!=NULL) { - next = tmp->below; - if (tmp->inv) - fix_container(tmp); - (void) insert_ob_in_ob(tmp,container); - tmp = next; - } - /* sum_weight will go through and calculate what all the containers are - * carrying. - */ - sum_weight(container); + container->inv = NULL; + while (tmp != NULL) + { + next = tmp->below; + if (tmp->inv) + fix_container (tmp); + (void) insert_ob_in_ob (tmp, container); + tmp = next; + } + /* sum_weight will go through and calculate what all the containers are + * carrying. + */ + sum_weight (container); } /* link_multipart_objects go through all the objects on the map looking @@ -458,123 +479,122 @@ * the more sections and not re-add sections for them. */ -static void link_multipart_objects(mapstruct *m) +static void +link_multipart_objects (maptile *m) { - int x,y; - object *tmp, *op, *last, *above; - archetype *at; - - for(x=0;xabove; - - /* already multipart - don't do anything more */ - if (tmp->head || tmp->more) continue; - - /* 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); - - /* update x,y coordinates */ - op->x += tmp->x; - op->y += tmp->y; - op->head = tmp; - op->map = m; - last->more = op; - if (tmp->name != op->name) { - if (op->name) free_string(op->name); - op->name = add_string(tmp->name); - } - if (tmp->title != op->title) { - if (op->title) free_string(op->title); - op->title = add_string(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 */ + 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; + + /* already multipart - don't do anything more */ + if (tmp->head || tmp->more) + continue; + + /* 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); + + /* 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 */ } - - /* * Loads (ands parses) the objects into a given map from the specified * file pointer. * mapflags is the same as we get with load_original_map */ +void +load_objects (maptile *m, object_thawer & fp, int mapflags) +{ + int i, j; + int unique; + object *op, *prev = NULL, *last_more = NULL, *otmp; -void load_objects (mapstruct *m, object_thawer &fp, int mapflags) { - int i,j,bufstate=LO_NEWFILE; - int unique; - object *op, *prev=NULL,*last_more=NULL, *otmp; - - op=get_object(); - op->map = m; /* To handle buttons correctly */ - - while((i = load_object (fp, op, bufstate, mapflags))) { - /* Since the loading of the map header does not load an object - * anymore, we need to pass LO_NEWFILE for the first object loaded, - * and then switch to LO_REPEAT for faster loading. - */ - bufstate = LO_REPEAT; - - /* if the archetype for the object is null, means that we - * got an invalid object. Don't do anything with it - the game - * or editor will not be able to do anything with it either. - */ - if (op->arch==NULL) { - LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)"); - continue; - } + op = object::create (); + op->map = m; /* To handle buttons correctly */ + while ((i = load_object (fp, op, mapflags))) + { + /* if the archetype for the object is null, means that we + * got an invalid object. Don't do anything with it - the game + * or editor will not be able to do anything with it either. + */ + if (op->arch == NULL) + { + LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); + continue; + } - switch(i) { + 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); + 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, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); if (op->inv) - sum_weight(op); + sum_weight (op); - prev=op,last_more=op; + prev = op, last_more = op; break; case LL_MORE: - insert_ob_in_map(op,m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); - op->head=prev,last_more->more=op,last_more=op; + insert_ob_in_map (op, m, 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=get_object(); - op->map = m; + + if (mapflags & MAP_STYLE) + remove_from_active_list (op); + + op = object::create (); + op->map = m; } - for (i=0;iwidth;i++){ - for (j=0;jheight;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); + + for (i = 0; i < m->width; i++) + { + for (j = 0; j < m->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); } } } - free_object(op); - link_multipart_objects(m); + + op->destroy (); + link_multipart_objects (m); } /* This saves all the objects on the map in a non destructive fashion. @@ -582,105 +602,115 @@ * and we only save the head of multi part objects - this is needed * in order to do map tiling properly. */ -void save_objects (mapstruct *m, object_freezer &fp, object_freezer &fp2, int flag) { - int i, j = 0,unique=0; - object *op; - /* first pass - save one-part objects */ - for(i = 0; i < MAP_WIDTH(m); i++) - for (j = 0; j < MAP_HEIGHT(m); j++) { - unique=0; - for(op = get_map_ob (m, i, j); op; op = op->above) { - if (QUERY_FLAG(op,FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) - unique=1; - - if(op->type == PLAYER) { - LOG(llevDebug, "Player on map that is being saved\n"); - continue; - } +void +save_objects (maptile *m, object_freezer &fp, object_freezer &fp2, int flag) +{ + int i, j = 0, unique = 0; + object *op; - if (op->head || op->owner) - continue; + /* first pass - save one-part objects */ + for (i = 0; i < m->width; i++) + for (j = 0; j < m->height; j++) + { + unique = 0; - if (unique || QUERY_FLAG(op, FLAG_UNIQUE)) - save_object (fp2, op, 3); - else - if (flag == 0 || - (flag == 2 && (!QUERY_FLAG(op, FLAG_OBJ_ORIGINAL) && - !QUERY_FLAG(op, FLAG_UNPAID)))) - save_object(fp, op, 3); + for (op = m->at (i, j).bot; op; op = op->above) + { + if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) + unique = 1; + + if (op->type == PLAYER) + continue; + + if (op->head || op->owner) + continue; + + 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); + } + } +} - } /* for this space */ - } /* for this j */ +maptile::maptile () +{ + in_memory = MAP_SWAPPED; + /* The maps used to pick up default x and y values from the + * map archetype. Mimic that behaviour. + */ + this->width = 16; + this->height = 16; + this->reset_timeout = 0; + this->timeout = 300; + this->enter_x = 0; + this->enter_y = 0; + /*set part to -1 indicating conversion to weather map not yet done */ + this->worldpartx = -1; + this->worldparty = -1; } /* - * Allocates, initialises, and returns a pointer to a mapstruct. + * 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 *mp, *map = new maptile; -mapstruct *get_linked_map(void) { - mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct)); - mapstruct *mp; - - if(map==NULL) - fatal(OUT_OF_MEMORY); - - for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next); - if(mp==NULL) - first_map=map; - else - mp->next=map; + for (mp = first_map; mp && mp->next; mp = mp->next); + + if (mp == NULL) + first_map = map; + else + mp->next = map; - map->in_memory=MAP_SWAPPED; - /* The maps used to pick up default x and y values from the - * map archetype. Mimic that behaviour. - */ - MAP_WIDTH(map)=16; - MAP_HEIGHT(map)=16; - MAP_RESET_TIMEOUT(map)=0; - MAP_TIMEOUT(map)=300; - MAP_ENTER_X(map)=0; - MAP_ENTER_Y(map)=0; - /*set part to -1 indicating conversion to weather map not yet done*/ - MAP_WORLDPARTX(map)=-1; - MAP_WORLDPARTY(map)=-1; - return map; + return map; } /* - * Allocates the arrays contained in a mapstruct. + * Allocates the arrays contained in a maptile. * This basically allocates the dynamic array of spaces for the * map. */ +void +maptile::allocate () +{ + in_memory = MAP_IN_MEMORY; -void allocate_map(mapstruct *m) { - m->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 (m->spaces) { - LOG(llevError,"allocate_map called with already allocated map (%s)\n", m->path); - free(m->spaces); + /* 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); + free (spaces); } - m->spaces = (MapSpace *) calloc(1, MAP_WIDTH(m) * MAP_HEIGHT(m) * sizeof(MapSpace)); + spaces = (mapspace *) + calloc (1, width * height * sizeof (mapspace)); - if(m->spaces==NULL) - fatal(OUT_OF_MEMORY); + if (!spaces) + fatal (OUT_OF_MEMORY); } /* Create and returns a map of the specific size. Used * in random map code and the editor. */ -mapstruct *get_empty_map(int sizex, int sizey) { - mapstruct *m = get_linked_map(); - m->width = sizex; - m->height = sizey; - m->in_memory = MAP_SWAPPED; - allocate_map(m); - return m; +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 @@ -689,88 +719,110 @@ * Called by parse_map_headers below. */ -static shopitems *parse_shop_string (const char *input_string) { - char *shop_string, *p, *q, *next_semicolon, *next_colon; - shopitems *items=NULL; - int i=0, number_of_entries=0; - const typedata *current_type; - - shop_string=strdup_local(input_string); - p=shop_string; - /* first we'll count the entries, we'll need that for allocating the array shortly */ - while (p) { - p=strchr(p, ';'); - number_of_entries++; - if (p) p++; - } - p=shop_string; - strip_endline(p); - items=(shopitems *) CALLOC(number_of_entries+1, sizeof(shopitems)); - memset(items, 0, (sizeof(shopitems) * number_of_entries+1)); - for (i=0; iname; - items[i].name_pl=current_type->name_pl; - } - } - else { /*we have a named type, let's figure out what it is */ - q=strpbrk(p,";:"); - if (q) *q='\0'; - - current_type=get_typedata_by_name(p); - if (current_type) { - items[i].name=current_type->name; - items[i].typenum=current_type->number; - items[i].name_pl=current_type->name_pl; - } - else { /* oh uh, something's wrong, let's free up this one, and try - * the next entry while we're at it, better print a warning - */ - LOG(llevError, "invalid type %s defined in shopitems in string %s\n", - p, input_string); - } - } - items[i].index=number_of_entries; - if (next_semicolon) p=++next_semicolon; - else p=NULL; +static shopitems * +parse_shop_string (const char *input_string) +{ + char *shop_string, *p, *q, *next_semicolon, *next_colon; + shopitems *items = NULL; + int i = 0, number_of_entries = 0; + const typedata *current_type; + + shop_string = strdup (input_string); + p = shop_string; + /* first we'll count the entries, we'll need that for allocating the array shortly */ + while (p) + { + p = strchr (p, ';'); + number_of_entries++; + if (p) + p++; + } + p = shop_string; + strip_endline (p); + items = new shopitems[number_of_entries + 1]; + for (i = 0; i < number_of_entries; i++) + { + if (!p) + { + LOG (llevError, "parse_shop_string: I seem to have run out of string, that shouldn't happen.\n"); + break; + } + next_semicolon = strchr (p, ';'); + next_colon = strchr (p, ':'); + /* if there is a stregth specified, figure out what it is, we'll need it soon. */ + if (next_colon && (!next_semicolon || next_colon < next_semicolon)) + items[i].strength = atoi (strchr (p, ':') + 1); + + if (isdigit (*p) || *p == '*') + { + items[i].typenum = atoi (p); /* atoi returns 0 when we have an asterisk */ + current_type = get_typedata (items[i].typenum); + if (current_type) + { + items[i].name = current_type->name; + items[i].name_pl = current_type->name_pl; + } + } + else + { /*we have a named type, let's figure out what it is */ + q = strpbrk (p, ";:"); + if (q) + *q = '\0'; + + current_type = get_typedata_by_name (p); + if (current_type) + { + items[i].name = current_type->name; + items[i].typenum = current_type->number; + items[i].name_pl = current_type->name_pl; + } + else + { /* oh uh, something's wrong, let's free up this one, and try + * the next entry while we're at it, better print a warning + */ + LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); + } + } + items[i].index = number_of_entries; + if (next_semicolon) + p = ++next_semicolon; + else + p = NULL; } - free(shop_string); - return items; + free (shop_string); + return items; } /* opposite of parse string, this puts the string that was originally fed in to * the map (or something equivilent) into output_string. */ -static void print_shop_string(mapstruct *m, char *output_string) { - int i; - char tmp[MAX_BUF]; - strcpy(output_string, ""); - for (i=0; i< m->shopitems[0].index; i++) { - if (m->shopitems[i].typenum) { - if (m->shopitems[i].strength) { - sprintf(tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); - } - else sprintf(tmp, "%s;", m->shopitems[i].name); - } - else { - if (m->shopitems[i].strength) { - sprintf(tmp, "*:%d;", m->shopitems[i].strength); +static void +print_shop_string (maptile *m, char *output_string) +{ + int i; + char tmp[MAX_BUF]; + + strcpy (output_string, ""); + for (i = 0; i < m->shopitems[0].index; i++) + { + if (m->shopitems[i].typenum) + { + if (m->shopitems[i].strength) + { + sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); + } + else + sprintf (tmp, "%s;", m->shopitems[i].name); + } + else + { + if (m->shopitems[i].strength) + { + sprintf (tmp, "*:%d;", m->shopitems[i].strength); } - else sprintf(tmp, "*"); + else + sprintf (tmp, "*"); } - strcat(output_string, tmp); + strcat (output_string, tmp); } } @@ -787,219 +839,259 @@ * return 0 on success, 1 on failure. */ -static int load_map_header(object_thawer &fp, mapstruct *m) +static int +load_map_header (object_thawer & fp, maptile *m) { - 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-1, fp)!=NULL) { - buf[HUGE_BUF-1] = 0; - key = buf; - while (isspace(*key)) key++; - if (*key == 0) continue; /* empty line */ - value = strchr(key, ' '); - if (!value) { - end = strchr(key, '\n'); - if (end != NULL) { - *end = 0; - } - } else { - *value = 0; - value++; - end = strchr(value, '\n'); - while (isspace(*value)) { - value++; - if (*value == '\0' || value == end) { - /* Nothing but spaces. */ - value = NULL; - break; + 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) + { + buf[HUGE_BUF - 1] = 0; + key = buf; + + while (isspace (*key)) + key++; + + if (*key == 0) + continue; /* empty line */ + + value = strchr (key, ' '); + + if (!value) + { + if ((end = strchr (key, '\n'))) + *end = 0; + } + else + { + *value = 0; + value++; + end = strchr (value, '\n'); + + while (isspace (*value)) + { + value++; + + 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; + + 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-1, fp)!=NULL) { - if (!strcmp(buf,"endmsg\n")) break; - else { - /* slightly more efficient than strcat */ - strcpy(msgbuf+msgpos, buf); - msgpos += strlen(buf); + /* 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_local(msgbuf); - } - else if (!strcmp(key,"maplore")) { - while (fgets(buf, HUGE_BUF-1, fp)!=NULL) { - if (!strcmp(buf,"endmaplore\n")) break; - else { - /* slightly more efficient than strcat */ - strcpy(maplorebuf+maplorepos, buf); - maplorepos += 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_local(maplorebuf); + if (maplorepos != 0) + m->maplore = strdup (maplorebuf); } - else if (!strcmp(key,"end")) { - break; + 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); } - else if (value == NULL) { - LOG(llevError, "Got '%s' line without parameter in map header\n", key); + /* 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, "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_local(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 = add_string (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 = atoi(value); - } 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_local(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); - - if (tile<1 || tile>4) { - LOG(llevError,"load_map_header: tile location %d out of bounds (%s)\n", - tile, m->path); - } else { - char *path; - - *end = 0; - - 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; + 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); + + if (tile < 1 || tile > 4) + { + LOG (llevError, "load_map_header: tile location %d out of bounds (%s)\n", tile, m->path); + } + else + { + char *path; + + *end = 0; + + 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; } - if (check_path(value, 1) != -1) { - /* The unadorned path works. */ - path = value; - } else { - /* Try again; it could be a relative exit. */ - - path = path_combine_and_normalize(m->path, value); - - if (check_path(path, 1) == -1) { - LOG(llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); - path = NULL; + if (check_path (value, 1) != -1) + { + /* The unadorned path works. */ + path = value; + } + else + { + /* Try again; it could be a relative exit. */ + + path = path_combine_and_normalize (m->path, value); + + if (check_path (path, 1) == -1) + { + LOG (llevError, "get_map_header: Bad tile path %s %s\n", m->path, value); + path = NULL; } } - if (editor) { - /* Use the value as in the file. */ - m->tile_path[tile-1] = strdup_local(value); - } else if (path != NULL) { - /* Use the normalized value. */ - m->tile_path[tile-1] = strdup_local(path); + if (editor) + { + /* Use the value as in the file. */ + m->tile_path[tile - 1] = strdup (value); } - } /* end if tile direction (in)valid */ - } - else { - LOG(llevError,"Got unknown value in map header: %s %s\n", key, value); + else if (path != NULL) + { + /* Use the normalized value. */ + m->tile_path[tile - 1] = strdup (path); + } + } /* end if tile direction (in)valid */ } + 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; + + if (!key || strcmp (key, "end")) + { + LOG (llevError, "Got premature eof on map header!\n"); + return 1; } - return 0; + + return 0; } /* * Opens the file "filename" and reads information about the map * from the given file, and stores it in a newly allocated - * mapstruct. A pointer to this structure is returned, or NULL on failure. + * 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 @@ -1008,44 +1100,47 @@ * managed map list. */ -mapstruct *load_original_map(const char *filename, int flags) { - mapstruct *m; - char pathname[MAX_BUF]; - - LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags); - 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)); +maptile * +load_original_map (const char *filename, int flags) +{ + maptile *m; + char pathname[MAX_BUF]; - object_thawer thawer (pathname); + 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)); - if (!thawer) - return 0; + LOG (llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname); - m = get_linked_map(); + object_thawer thawer (pathname); - 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 NULL; + if (!thawer) + return 0; + + m = get_linked_map (); + + 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; } - allocate_map(m); + m->allocate (); - m->in_memory=MAP_LOADING; - load_objects (m, thawer, flags & (MAP_BLOCK|MAP_STYLE)); + m->in_memory = MAP_LOADING; + load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); - m->in_memory=MAP_IN_MEMORY; - if (!MAP_DIFFICULTY(m)) - MAP_DIFFICULTY(m)=calculate_difficulty(m); - set_map_reset_time(m); - m->instantiate (); - return (m); + m->in_memory = MAP_IN_MEMORY; + if (!m->difficulty) + m->difficulty = calculate_difficulty (m); + set_map_reset_time (m); + m->instantiate (); + return (m); } /* @@ -1054,47 +1149,52 @@ * option if we can't find the original map) */ -static mapstruct *load_temporary_map(mapstruct *m) { - int comp; - char buf[MAX_BUF]; - - if (!m->tmpname) { - 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; - } +static maptile * +load_temporary_map (maptile *m) +{ + char buf[MAX_BUF]; - object_thawer thawer (m->tmpname); + if (!m->tmpname) + { + 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; + } - 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; - } + object_thawer thawer (m->tmpname); - 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); + 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; } - allocate_map(m); - m->in_memory=MAP_LOADING; - load_objects (m, thawer, 0); + 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; + } - m->in_memory=MAP_IN_MEMORY; - INVOKE_MAP (SWAPIN, m); - return m; + m->allocate (); + + m->in_memory = MAP_LOADING; + load_objects (m, thawer, 0); + + m->in_memory = MAP_IN_MEMORY; + INVOKE_MAP (SWAPIN, m); + return m; } /* @@ -1103,30 +1203,32 @@ * option if we can't find the original map) */ -mapstruct *load_overlay_map(const char *filename, mapstruct *m) { - char pathname[MAX_BUF]; +maptile * +load_overlay_map (const char *filename, maptile *m) +{ + char pathname[MAX_BUF]; - strcpy(pathname, create_overlay_pathname(filename)); + strcpy (pathname, create_overlay_pathname (filename)); - object_thawer thawer (pathname); + object_thawer thawer (pathname); - if (!thawer) - return m; - - if (load_map_header(thawer, m)) { - 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 NULL; + if (!thawer) + return m; + + if (load_map_header (thawer, m)) + { + 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; } - /*allocate_map(m);*/ + /*m->allocate ();*/ - m->in_memory=MAP_LOADING; - load_objects (m, thawer, MAP_OVERLAY); + m->in_memory = MAP_LOADING; + load_objects (m, thawer, MAP_OVERLAY); - m->in_memory=MAP_IN_MEMORY; - return m; + m->in_memory = MAP_IN_MEMORY; + return m; } /****************************************************************************** @@ -1134,27 +1236,31 @@ *****************************************************************************/ /* This goes through map 'm' and removed any unique items on the map. */ -static void delete_unique_items(mapstruct *m) +static void +delete_unique_items (maptile *m) { - int i,j,unique; - object *op, *next; + int i, j, unique; + object *op, *next; - for(i=0; iabove; - if (QUERY_FLAG(op, FLAG_IS_FLOOR) && QUERY_FLAG(op, FLAG_UNIQUE)) - unique=1; - if(op->head == NULL && (QUERY_FLAG(op, FLAG_UNIQUE) || unique)) { - clean_object(op); - if (QUERY_FLAG(op, FLAG_IS_LINKED)) - remove_button_link(op); - remove_ob(op); - free_object(op); - } - } - } + for (i = 0; i < m->width; i++) + for (j = 0; j < m->height; j++) + { + unique = 0; + + for (op = GET_MAP_OB (m, i, j); op; op = next) + { + next = op->above; + + 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 (); + } + } + } } @@ -1162,45 +1268,48 @@ * 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(mapstruct *m) { - int count; - char firstname[MAX_BUF]; +static void +load_unique_objects (maptile *m) +{ + 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; + 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; + /* If we get here, we did not find any map */ + if (count == 10) + return; - object_thawer thawer (firstname); + object_thawer thawer (firstname); - if (!thawer) - return; + 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_object(thawer, NULL, LO_NOREAD,0); - load_objects (m, thawer, 0); + 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 */ - m->in_memory=MAP_IN_MEMORY; -} + 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 mapstructure. + * 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 (mapstruct * m, int flag) +new_save_map (maptile *m, int flag) { - char filename[MAX_BUF], buf[MAX_BUF], buf_s[MAX_BUF], shop[MAX_BUF]; + char filename[MAX_BUF], buf[MAX_BUF], shop[MAX_BUF]; int i; if (flag && !*m->path) @@ -1212,7 +1321,7 @@ if (flag || (m->unique) || (m->templatemap)) { if (!m->unique && !m->templatemap) - { /* flag is set */ + { /* flag is set */ if (flag == 2) strcpy (filename, create_overlay_pathname (m->path)); else @@ -1226,7 +1335,7 @@ else { if (!m->tmpname) - m->tmpname = tempnam_local (settings.tmpdir, NULL); + m->tmpname = tempnam (settings.tmpdir, NULL); strcpy (filename, m->tmpname); } @@ -1260,17 +1369,10 @@ } if (m->shopgreed) fprintf (freezer, "shopgreed %f\n", m->shopgreed); -#ifndef WIN32 if (m->shopmin) fprintf (freezer, "shopmin %llu\n", m->shopmin); if (m->shopmax) fprintf (freezer, "shopmax %llu\n", m->shopmax); -#else - if (m->shopmin) - fprintf (freezer, "shopmin %I64u\n", m->shopmin); - if (m->shopmax) - fprintf (freezer, "shopmax %I64u\n", m->shopmax); -#endif if (m->shoprace) fprintf (freezer, "shoprace %s\n", m->shoprace); if (m->darkness) @@ -1336,7 +1438,7 @@ unique.save (buf); } else - { /* save same file when not playing, like in editor */ + { /* save same file when not playing, like in editor */ save_objects (m, freezer, freezer, 0); } @@ -1345,149 +1447,111 @@ return 0; } - /* - * Remove and free all objects in the inventory of the given object. - * object.c ? + * Remove and free all objects in the given map. */ - -void clean_object(object *op) +void +free_all_objects (maptile *m) { - object *tmp, *next; + if (!m->spaces) + return; - for(tmp = op->inv; tmp; tmp = next) - { - next = tmp->below; - clean_object(tmp); - if (QUERY_FLAG(tmp, FLAG_IS_LINKED)) - remove_button_link(tmp); - remove_ob(tmp); - free_object(tmp); - } + for (int i = 0; i < m->width; i++) + for (int j = 0; j < m->height; j++) + { + mapspace &ms = m->at (i, j); + + while (object *op = ms.bot) + { + if (op->head) + op = op->head; + + op->destroy_inv (false); + op->destroy (); + } + } } /* - * Remove and free all objects in the given map. + * 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) +{ + if (!m->in_memory) //TODO: makes no sense to me? + return; -void free_all_objects(mapstruct *m) { - int i,j; - object *op; - - for(i=0;ihead!=NULL) - op = op->head; + m->in_memory = MAP_SAVING; - /* If the map isn't in memory, free_object will remove and - * free objects in op's inventory. So let it do the job. - */ - if (m->in_memory==MAP_IN_MEMORY) - clean_object(op); - remove_ob(op); - free_object(op); - } - } -} + // TODO: use new/delete -/* - * Frees everything allocated by the given mapstructure. - * don't free tmpname - our caller is left to do that - */ + if (flag && m->spaces) + free_all_objects (m); + + free (m->name), m->name = 0; + free (m->spaces), m->spaces = 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; -void free_map(mapstruct *m,int flag) { - int i; + if (m->buttons) + free_objectlinkpt (m->buttons), m->buttons = 0; + + for (int i = 0; i < 4; i++) + { + if (m->tile_path[i]) + free (m->tile_path[i]), m->tile_path[i] = 0; - if (!m->in_memory) { - LOG(llevError,"Trying to free freed map.\n"); - return; - } - if (flag && m->spaces) free_all_objects(m); - if (m->name) FREE_AND_CLEAR(m->name); - if (m->spaces) FREE_AND_CLEAR(m->spaces); - if (m->msg) FREE_AND_CLEAR(m->msg); - if (m->maplore) FREE_AND_CLEAR(m->maplore); - if (m->shopitems) FREE_AND_CLEAR(m->shopitems); - if (m->shoprace) FREE_AND_CLEAR(m->shoprace); - if (m->buttons) - free_objectlinkpt(m->buttons); - m->buttons = NULL; - for (i=0; i<4; i++) { - if (m->tile_path[i]) FREE_AND_CLEAR(m->tile_path[i]); - m->tile_map[i] = NULL; - } - m->in_memory = MAP_SWAPPED; -} - -/* - * function: vanish mapstruct - * m : pointer to mapstruct, if NULL no action - * this deletes all the data on the map (freeing pointers) - * and then removes this map from the global linked list of maps. - */ - -void delete_map(mapstruct *m) { - mapstruct *tmp, *last; - int i; - - if (!m) - return; - - m->clear (); - - if (m->in_memory == MAP_IN_MEMORY) { - /* change to MAP_SAVING, even though we are not, - * so that remove_ob doesn't do as much work. - */ - m->in_memory = MAP_SAVING; - free_map (m, 1); - } - /* move this out of free_map, since tmpname can still be needed if - * the map is swapped out. - */ - if (m->tmpname) { - free(m->tmpname); - m->tmpname=NULL; - } - last = NULL; - /* 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 assymetric, we just can not look to see which - * maps this map tiles with and clears those. - */ - for (tmp = first_map; tmp != NULL; tmp = tmp->next) { - if (tmp->next == m) last = tmp; - - /* This should hopefully get unrolled on a decent compiler */ - for (i=0; i<4; i++) - if (tmp->tile_map[i] == m) tmp->tile_map[i]=NULL; - } - - /* If last is null, then this should be the first map in the list */ - if (!last) { - if (m == first_map) - first_map = m->next; - else - /* m->path is a static char, so should hopefully still have - * some useful data in it. - */ - LOG(llevError,"delete_map: Unable to find map %s in list\n", - m->path); + m->tile_map[i] = 0; } - else - last->next = m->next; - free (m); + m->in_memory = MAP_SWAPPED; +} + +maptile::~maptile () +{ + free_map (this, 1); + free (tmpname); } +void +maptile::do_destroy () +{ + attachable::do_destroy (); + + free_all_objects (this); + + /* 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 (maptile *m = first_map; m; m = m->next) + for (int i = 0; i < 4; i++) + if (m->tile_map[i] == this) + m->tile_map[i] = 0; + if (first_map == this) + first_map = next; + else + for (maptile *m = first_map; m; m = m->next) + if (m->next = this) + { + m->next = next; + break; + } +} + +//TODO: must go +void +delete_map (maptile *m) +{ + if (m) + m->destroy (); +} /* * Makes sure the given map is loaded and swapped in. @@ -1500,95 +1564,101 @@ * * Returns a pointer to the given map. */ +maptile * +ready_map_name (const char *name, int flags) +{ + 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); + } -mapstruct *ready_map_name(const char *name, int flags) { - mapstruct *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 (!name) - return (NULL); + //eval_pv ("$x = Event::time", 1);//D + if (!(m = load_original_map (name, (flags & MAP_PLAYER_UNIQUE)))) + return (NULL); + //eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D + + 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); - /* Have we been at this level before? */ - m = has_been_loaded (name); + if (!(flags & (MAP_FLUSH | MAP_PLAYER_UNIQUE | MAP_OVERLAY))) + { + m = load_overlay_map (name, m); + if (m == NULL) + return NULL; + } - /* 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. - */ - - 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 (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. + */ + + 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; } @@ -1603,36 +1673,38 @@ * is much better than this functions guesswork. */ -int calculate_difficulty(mapstruct *m) { +int +calculate_difficulty (maptile *m) +{ object *op; archetype *at; - int x, y, i, diff; + int x, y, i; long monster_cnt = 0; double avgexp = 0; sint64 total_exp = 0; - if (MAP_DIFFICULTY (m)) + if (m->difficulty) { - LOG(llevDebug, "Using stored map difficulty: %d\n", MAP_DIFFICULTY (m)); - return MAP_DIFFICULTY (m); + LOG (llevDebug, "Using stored map difficulty: %d\n", m->difficulty); + return m->difficulty; } - for(x = 0; x < MAP_WIDTH(m); x++) - for(y = 0; y < MAP_HEIGHT(m); y++) - for(op = get_map_ob(m, x, y); op != NULL; op = op->above) + 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)) + if (QUERY_FLAG (op, FLAG_MONSTER)) { total_exp += op->stats.exp; monster_cnt++; } - if(QUERY_FLAG (op, FLAG_GENERATOR)) + if (QUERY_FLAG (op, FLAG_GENERATOR)) { total_exp += op->stats.exp; - at = type_to_archetype(GENERATE_TYPE (op)); + at = type_to_archetype (GENERATE_TYPE (op)); - if(at != NULL) + if (at != NULL) total_exp += at->clone.stats.exp * 8; monster_cnt++; @@ -1653,26 +1725,31 @@ return 1; } -void clean_tmp_map(mapstruct *m) { - if(m->tmpname == NULL) - return; +void +clean_tmp_map (maptile *m) +{ + if (m->tmpname == NULL) + return; INVOKE_MAP (CLEAN, m); - (void) unlink(m->tmpname); + (void) unlink (m->tmpname); } -void free_all_maps(void) +void +free_all_maps (void) { - int real_maps=0; + 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++; + 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); + LOG (llevDebug, "free_all_maps: Freed %d maps\n", real_maps); } /* change_map_light() - used to change map light level (darkness) @@ -1682,36 +1759,40 @@ * to maps than los. * postive values make it darker, negative make it brighter */ - -int change_map_light(mapstruct *m, int change) { - int new_level = m->darkness + change; - - /* Nothing to do */ - if(!change || (new_level <= 0 && m->darkness == 0) || - (new_level >= MAX_DARKNESS && m->darkness >=MAX_DARKNESS)) { - return 0; + +int +change_map_light (maptile *m, int change) +{ + int new_level = m->darkness + change; + + /* Nothing to do */ + if (!change || (new_level <= 0 && m->darkness == 0) || (new_level >= MAX_DARKNESS && m->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."); - else - new_info_map(NDI_BLACK|NDI_UNIQUE, m,"It becomes brighter."); + /* inform all players on the map */ + if (change > 0) + new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes darker."); + else + new_info_map (NDI_BLACK | NDI_UNIQUE, m, "It becomes brighter."); - /* Do extra checking. since m->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; - else if (new_level >=MAX_DARKNESS) m->darkness = MAX_DARKNESS; - else m->darkness=new_level; - - /* All clients need to get re-updated for the change */ - update_all_map_los(m); - return 1; -} + /* Do extra checking. since m->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; + else if (new_level >= MAX_DARKNESS) + m->darkness = MAX_DARKNESS; + else + m->darkness = new_level; + /* All clients need to get re-updated for the change */ + update_all_map_los (m); + return 1; +} /* * This function updates various attributes about a specific space @@ -1719,197 +1800,189 @@ * has a living creatures, prevents people from passing * through, etc) */ -void update_position (mapstruct *m, int x, int y) { - object *tmp, *last = NULL; - uint8 flags = 0, oldflags, light=0, anywhere=0; - New_Face *top,*floor, *middle; - object *top_obj, *floor_obj, *middle_obj; - MoveType move_block=0, move_slow=0, move_on=0, move_off=0, move_allow=0; - - oldflags = GET_MAP_FLAGS(m,x,y); - if (!(oldflags & P_NEED_UPDATE)) { - LOG(llevDebug,"update_position called with P_NEED_UPDATE not set: %s (%d, %d)\n", - m->path, x, y); - return; - } - - middle=blank_face; - top=blank_face; - floor=blank_face; - - middle_obj = NULL; - top_obj = NULL; - floor_obj = NULL; - - for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) { - - /* This could be made additive I guess (two lights better than - * one). But if so, it shouldn't be a simple additive - 2 - * light bulbs do not illuminate twice as far as once since - * it is a disapation factor that is squared (or is it cubed?) - */ - if (tmp->glow_radius > light) light = tmp->glow_radius; - - /* This call is needed in order to update objects the player - * is standing in that have animations (ie, grass, fire, etc). - * However, it also causes the look window to be re-drawn - * 3 times each time the player moves, because many of the - * functions the move_player calls eventualy call this. - * - * Always put the player down for drawing. - */ - if (!tmp->invisible) { - if ((tmp->type==PLAYER || QUERY_FLAG(tmp, FLAG_MONSTER))) { - top = tmp->face; - top_obj = tmp; - } - else if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) { - /* If we got a floor, that means middle and top were below it, - * so should not be visible, so we clear them. - */ - middle=blank_face; - top=blank_face; - floor = tmp->face; - floor_obj = tmp; - } - /* Flag anywhere have high priority */ - else if (QUERY_FLAG(tmp, FLAG_SEE_ANYWHERE)) { - middle = tmp->face; - - middle_obj = tmp; - anywhere =1; - } - /* Find the highest visible face around. If equal - * visibilities, we still want the one nearer to the - * top - */ - else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) { - middle = tmp->face; - middle_obj = tmp; - } - } - if (tmp==tmp->above) { - LOG(llevError, "Error in structure of map\n"); - exit (-1); - } - - move_slow |= tmp->move_slow; - move_block |= tmp->move_block; - move_on |= tmp->move_on; - move_off |= tmp->move_off; - move_allow |= tmp->move_allow; - - if (QUERY_FLAG(tmp,FLAG_ALIVE)) - flags |= P_IS_ALIVE; - if (QUERY_FLAG(tmp,FLAG_NO_MAGIC)) - flags |= P_NO_MAGIC; - if (QUERY_FLAG(tmp,FLAG_DAMNED)) - flags |= P_NO_CLERIC; - if (tmp->type == SAFE_GROUND) - flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC; - - if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW)) - flags |= P_BLOCKSVIEW; - } /* for stack of objects */ - - /* we don't want to rely on this function to have accurate flags, but - * since we're already doing the work, we calculate them here. - * if they don't match, logic is broken someplace. - */ - if (((oldflags & ~(P_NEED_UPDATE|P_NO_ERROR)) != flags) && - (!(oldflags & P_NO_ERROR))) { - LOG(llevDebug,"update_position: updated flags do not match old flags: %s (old=%d,new=%d) %x != %x\n", - m->path, x, y, - (oldflags & ~P_NEED_UPDATE), flags); - } - SET_MAP_FLAGS(m, x, y, flags); - SET_MAP_MOVE_BLOCK(m, x, y, move_block & ~move_allow); - SET_MAP_MOVE_ON(m, x, y, move_on); - SET_MAP_MOVE_OFF(m, x, y, move_off); - SET_MAP_MOVE_SLOW(m, x, y, move_slow); - - /* At this point, we have a floor face (if there is a floor), - * and the floor is set - we are not going to touch it at - * this point. - * middle contains the highest visibility face. - * top contains a player/monster face, if there is one. - * - * We now need to fill in top.face and/or middle.face. - */ - - /* If the top face also happens to be high visibility, re-do our - * middle face. This should not happen, as we already have the - * else statement above so middle should not get set. OTOH, it - * may be possible for the faces to match but be different objects. - */ - if (top == middle) middle=blank_face; - - /* There are three posibilities at this point: - * 1) top face is set, need middle to be set. - * 2) middle is set, need to set top. - * 3) neither middle or top is set - need to set both. - */ - - for (tmp=last; tmp; tmp=tmp->below) { - /* Once we get to a floor, stop, since we already have a floor object */ - if (QUERY_FLAG(tmp,FLAG_IS_FLOOR)) break; - - /* If two top faces are already set, quit processing */ - if ((top != blank_face) && (middle != blank_face)) break; - - /* Only show visible faces, unless its the editor - show all */ - if (!tmp->invisible || editor) { - /* Fill in top if needed */ - if (top == blank_face) { - top = tmp->face; - top_obj = tmp; - if (top == middle) middle=blank_face; - } else { - /* top is already set - we should only get here if - * middle is not set - * - * Set the middle face and break out, since there is nothing - * more to fill in. We don't check visiblity here, since - * - */ - if (tmp->face != top ) { - middle = tmp->face; - middle_obj = tmp; - break; +void +mapspace::update_ () +{ + object *tmp, *last = 0; + uint8 flags = 0, light = 0, anywhere = 0; + New_Face *top, *floor, *middle; + object *top_obj, *floor_obj, *middle_obj; + MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; + + middle = blank_face; + top = blank_face; + floor = blank_face; + + middle_obj = 0; + top_obj = 0; + floor_obj = 0; + + for (tmp = bot; tmp; last = tmp, tmp = tmp->above) + { + /* This could be made additive I guess (two lights better than + * one). But if so, it shouldn't be a simple additive - 2 + * light bulbs do not illuminate twice as far as once since + * it is a dissapation factor that is cubed. + */ + if (tmp->glow_radius > light) + light = tmp->glow_radius; + + /* This call is needed in order to update objects the player + * is standing in that have animations (ie, grass, fire, etc). + * However, it also causes the look window to be re-drawn + * 3 times each time the player moves, because many of the + * functions the move_player calls eventualy call this. + * + * Always put the player down for drawing. + */ + if (!tmp->invisible) + { + if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) + { + top = tmp->face; + top_obj = tmp; + } + else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) + { + /* If we got a floor, that means middle and top were below it, + * so should not be visible, so we clear them. + */ + middle = blank_face; + top = blank_face; + floor = tmp->face; + floor_obj = tmp; + } + /* Flag anywhere have high priority */ + else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) + { + middle = tmp->face; + + middle_obj = tmp; + anywhere = 1; + } + /* Find the highest visible face around. If equal + * visibilities, we still want the one nearer to the + * top + */ + else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) + { + middle = tmp->face; + middle_obj = tmp; + } + } + + if (tmp == tmp->above) + { + LOG (llevError, "Error in structure of map\n"); + exit (-1); + } + + move_slow |= tmp->move_slow; + move_block |= tmp->move_block; + move_on |= tmp->move_on; + move_off |= tmp->move_off; + move_allow |= tmp->move_allow; + + if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; + if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; + if (tmp->type == PLAYER) flags |= P_PLAYER; + if (tmp->type == SAFE_GROUND) flags |= P_SAFE; + if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE; + if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC; + } + + this->light = light; + this->flags_ = flags; + this->move_block = move_block & ~move_allow; + this->move_on = move_on; + this->move_off = move_off; + this->move_slow = move_slow; + + /* At this point, we have a floor face (if there is a floor), + * and the floor is set - we are not going to touch it at + * this point. + * middle contains the highest visibility face. + * top contains a player/monster face, if there is one. + * + * We now need to fill in top.face and/or middle.face. + */ + + /* If the top face also happens to be high visibility, re-do our + * middle face. This should not happen, as we already have the + * else statement above so middle should not get set. OTOH, it + * may be possible for the faces to match but be different objects. + */ + if (top == middle) + middle = blank_face; + + /* There are three posibilities at this point: + * 1) top face is set, need middle to be set. + * 2) middle is set, need to set top. + * 3) neither middle or top is set - need to set both. + */ + + for (tmp = last; tmp; tmp = tmp->below) + { + /* Once we get to a floor, stop, since we already have a floor object */ + if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) + break; + + /* If two top faces are already set, quit processing */ + if ((top != blank_face) && (middle != blank_face)) + break; + + /* Only show visible faces, unless its the editor - show all */ + if (!tmp->invisible || editor) + { + /* Fill in top if needed */ + if (top == blank_face) + { + top = tmp->face; + top_obj = tmp; + if (top == middle) + middle = blank_face; + } + else + { + /* top is already set - we should only get here if + * middle is not set + * + * Set the middle face and break out, since there is nothing + * more to fill in. We don't check visiblity here, since + * + */ + if (tmp->face != top) + { + middle = tmp->face; + middle_obj = tmp; + break; } } } } - if (middle == floor) middle = blank_face; - if (top == middle) middle = blank_face; - SET_MAP_FACE(m,x,y,top,0); - if(top != blank_face) - SET_MAP_FACE_OBJ(m,x,y,top_obj,0); - else - SET_MAP_FACE_OBJ(m,x,y,NULL,0); - SET_MAP_FACE(m,x,y,middle,1); - if(middle != blank_face) - SET_MAP_FACE_OBJ(m,x,y,middle_obj,1); - else - SET_MAP_FACE_OBJ(m,x,y,NULL,1); - SET_MAP_FACE(m,x,y,floor,2); - if(floor != blank_face) - SET_MAP_FACE_OBJ(m,x,y,floor_obj,2); - else - SET_MAP_FACE_OBJ(m,x,y,NULL,2); - SET_MAP_LIGHT(m,x,y,light); -} + if (middle == floor) + middle = blank_face; -void set_map_reset_time(mapstruct *map) { - int timeout; + if (top == middle) + middle = blank_face; - timeout = MAP_RESET_TIMEOUT(map); - if (timeout <= 0) - timeout = MAP_DEFAULTRESET; - if (timeout >= MAP_MAXRESET) - timeout = MAP_MAXRESET; - MAP_WHEN_RESET(map) = seconds()+timeout; + faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; + faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; + faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; +} + +void +set_map_reset_time (maptile *map) +{ + int timeout; + + timeout = map->reset_timeout; + if (timeout <= 0) + timeout = MAP_DEFAULTRESET; + if (timeout >= MAP_MAXRESET) + timeout = MAP_MAXRESET; + map->reset_time = time (0) + timeout; } /* this updates the orig_map->tile_map[tile_num] value after loading @@ -1919,19 +1992,19 @@ * so that it is easier for calling functions to verify success. */ -static mapstruct *load_and_link_tiled_map(mapstruct *orig_map, int tile_num) +static maptile * +load_and_link_tiled_map (maptile *orig_map, int tile_num) { - int dest_tile = (tile_num +2) % 4; - char *path = path_combine_and_normalize(orig_map->path, orig_map->tile_path[tile_num]); + 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] = ready_map_name (path, 0); - /* 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)) - orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; + /* 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)) + orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; - return orig_map->tile_map[tile_num]; + return orig_map->tile_map[tile_num]; } /* this returns TRUE if the coordinates (x,y) are out of @@ -1944,48 +2017,64 @@ * * */ -int out_of_map(mapstruct *m, int x, int y) +int +out_of_map (maptile *m, int x, int y) { + /* If we get passed a null map, this is obviously the + * case. This generally shouldn't happen, but if the + * map loads fail below, it could happen. + */ + if (!m) + return 0; - /* If we get passed a null map, this is obviously the - * case. This generally shouldn't happen, but if the - * map loads fail below, it could happen. - */ - if (!m) return 0; + if (x < 0) + { + if (!m->tile_path[3]) + return 1; - if (x<0) { - if (!m->tile_path[3]) return 1; - 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 + MAP_WIDTH(m->tile_map[3]), y)); + 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)); } - if (x>=MAP_WIDTH(m)) { - if (!m->tile_path[1]) return 1; - 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 - MAP_WIDTH(m), y)); + + if (x >= m->width) + { + if (!m->tile_path[1]) + return 1; + + 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)); } - if (y<0) { - if (!m->tile_path[0]) return 1; - 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 + MAP_HEIGHT(m->tile_map[0]))); + + if (y < 0) + { + if (!m->tile_path[0]) + return 1; + + 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)); } - if (y>=MAP_HEIGHT(m)) { - if (!m->tile_path[2]) return 1; - 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 - MAP_HEIGHT(m))); + + if (y >= m->height) + { + if (!m->tile_path[2]) + return 1; + + 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)); } - /* Simple case - coordinates are within this local - * map. - */ - return 0; + /* Simple case - coordinates are within this local + * map. + */ + return 0; } /* This is basically the same as out_of_map above, but @@ -1996,104 +2085,148 @@ * Using this is more efficient of calling out_of_map * and then figuring out what the real map is */ -mapstruct *get_map_from_coord(mapstruct *m, sint16 *x, sint16 *y) +maptile * +get_map_from_coord (maptile *m, sint16 * x, sint16 * y) { - if (*x<0) { - if (!m->tile_path[3]) return NULL; - if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) - load_and_link_tiled_map(m, 3); + 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); - *x += MAP_WIDTH(m->tile_map[3]); - return (get_map_from_coord(m->tile_map[3], x, y)); + *x += m->tile_map[3]->width; + return (get_map_from_coord (m->tile_map[3], x, y)); } - if (*x>=MAP_WIDTH(m)) { - if (!m->tile_path[1]) return NULL; - if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) - load_and_link_tiled_map(m, 1); - *x -= MAP_WIDTH(m); - return (get_map_from_coord(m->tile_map[1], x, y)); + if (*x >= m->width) + { + if (!m->tile_path[1]) + return 0; + + if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) + load_and_link_tiled_map (m, 1); + + *x -= m->width; + return (get_map_from_coord (m->tile_map[1], x, y)); } - if (*y<0) { - if (!m->tile_path[0]) return NULL; - if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) - load_and_link_tiled_map(m, 0); - *y += MAP_HEIGHT(m->tile_map[0]); - return (get_map_from_coord(m->tile_map[0], x, y)); + if (*y < 0) + { + if (!m->tile_path[0]) + return 0; + + if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) + load_and_link_tiled_map (m, 0); + + *y += m->tile_map[0]->height; + return (get_map_from_coord (m->tile_map[0], x, y)); } - if (*y>=MAP_HEIGHT(m)) { - if (!m->tile_path[2]) return NULL; - if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) - load_and_link_tiled_map(m, 2); - *y -= MAP_HEIGHT(m); - return (get_map_from_coord(m->tile_map[2], x, y)); + if (*y >= m->height) + { + if (!m->tile_path[2]) + return 0; + + if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) + load_and_link_tiled_map (m, 2); + + *y -= m->height; + return (get_map_from_coord (m->tile_map[2], x, y)); } - /* Simple case - coordinates are within this local - * map. - */ + /* Simple case - coordinates are within this local + * map. + */ - return m; + return m; } /** * Return whether map2 is adjacent to map1. If so, store the distance from * map1 to map2 in dx/dy. */ -static int adjacent_map(const mapstruct *map1, const mapstruct *map2, int *dx, int *dy) { - if (!map1 || !map2) - return 0; +static int +adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) +{ + if (!map1 || !map2) + return 0; - if (map1 == map2) { - *dx = 0; - *dy = 0; - - } else if (map1->tile_map[0] == map2) { /* up */ - *dx = 0; - *dy = -MAP_HEIGHT(map2); - } else if (map1->tile_map[1] == map2) { /* right */ - *dx = MAP_WIDTH(map1); - *dy = 0; - } else if (map1->tile_map[2] == map2) { /* down */ - *dx = 0; - *dy = MAP_HEIGHT(map1); - } else if (map1->tile_map[3] == map2) { /* left */ - *dx = -MAP_WIDTH(map2); - *dy = 0; - - } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) { /* up right */ - *dx = MAP_WIDTH(map1->tile_map[0]); - *dy = -MAP_HEIGHT(map1->tile_map[0]); - } else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) { /* up left */ - *dx = -MAP_WIDTH(map2); - *dy = -MAP_HEIGHT(map1->tile_map[0]); - } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) { /* right up */ - *dx = MAP_WIDTH(map1); - *dy = -MAP_HEIGHT(map2); - } else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) { /* right down */ - *dx = MAP_WIDTH(map1); - *dy = MAP_HEIGHT(map1->tile_map[1]); - } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) { /* down right */ - *dx = MAP_WIDTH(map1->tile_map[2]); - *dy = MAP_HEIGHT(map1); - } else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) { /* down left */ - *dx = -MAP_WIDTH(map2); - *dy = MAP_HEIGHT(map1); - } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) { /* left up */ - *dx = -MAP_WIDTH(map1->tile_map[3]); - *dy = -MAP_HEIGHT(map2); - } else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) { /* left down */ - *dx = -MAP_WIDTH(map1->tile_map[3]); - *dy = MAP_HEIGHT(map1->tile_map[3]); + if (map1 == map2) + { + *dx = 0; + *dy = 0; - } else { /* not "adjacent" enough */ - return 0; + } + else if (map1->tile_map[0] == map2) + { /* up */ + *dx = 0; + *dy = -map2->height; + } + else if (map1->tile_map[1] == map2) + { /* right */ + *dx = map1->width; + *dy = 0; + } + else if (map1->tile_map[2] == map2) + { /* down */ + *dx = 0; + *dy = map1->height; + } + else if (map1->tile_map[3] == map2) + { /* left */ + *dx = -map2->width; + *dy = 0; + + } + else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) + { /* up right */ + *dx = map1->tile_map[0]->width; + *dy = -map1->tile_map[0]->height; + } + else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) + { /* up left */ + *dx = -map2->width; + *dy = -map1->tile_map[0]->height; + } + else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) + { /* right up */ + *dx = map1->width; + *dy = -map2->height; + } + else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) + { /* right down */ + *dx = map1->width; + *dy = map1->tile_map[1]->height; + } + else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) + { /* down right */ + *dx = map1->tile_map[2]->width; + *dy = map1->height; + } + else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) + { /* down left */ + *dx = -map2->width; + *dy = map1->height; + } + else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) + { /* left up */ + *dx = -map1->tile_map[3]->width; + *dy = -map2->height; + } + else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) + { /* left down */ + *dx = -map1->tile_map[3]->width; + *dy = map1->tile_map[3]->height; + + } + else + { /* not "adjacent" enough */ + return 0; } - return 1; + return 1; } /* From map.c @@ -2117,49 +2250,57 @@ * closest body part of 'op1' */ -void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags) { - if (!adjacent_map(op1->map, op2->map, &retval->distance_x, &retval->distance_y)) { - /* be conservative and fill in _some_ data */ - retval->distance = 100000; - retval->distance_x = 32767; - retval->distance_y = 32767; - retval->direction = 0; - retval->part = 0; - } else { - object *best; - - retval->distance_x += op2->x-op1->x; - retval->distance_y += op2->y-op1->y; - - best = op1; - /* If this is multipart, find the closest part now */ - if (!(flags&0x1) && op1->more) { - object *tmp; - int best_distance = retval->distance_x*retval->distance_x+ - retval->distance_y*retval->distance_y, tmpi; - - /* we just take the offset of the piece to head to figure - * distance instead of doing all that work above again - * since the distance fields we set above are positive in the - * same axis as is used for multipart objects, the simply arithmetic - * below works. - */ - for (tmp = op1->more; tmp != NULL; tmp = tmp->more) { - tmpi = (op1->x-tmp->x+retval->distance_x)*(op1->x-tmp->x+retval->distance_x)+ - (op1->y-tmp->y+retval->distance_y)*(op1->y-tmp->y+retval->distance_y); - if (tmpi < best_distance) { - best_distance = tmpi; - best = tmp; +void +get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) +{ + if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) + { + /* be conservative and fill in _some_ data */ + retval->distance = 100000; + retval->distance_x = 32767; + retval->distance_y = 32767; + retval->direction = 0; + retval->part = 0; + } + else + { + object *best; + + retval->distance_x += op2->x - op1->x; + retval->distance_y += op2->y - op1->y; + + best = op1; + /* If this is multipart, find the closest part now */ + if (!(flags & 0x1) && op1->more) + { + object *tmp; + int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; + + /* we just take the offset of the piece to head to figure + * distance instead of doing all that work above again + * since the distance fields we set above are positive in the + * same axis as is used for multipart objects, the simply arithmetic + * below works. + */ + for (tmp = op1->more; tmp != NULL; tmp = tmp->more) + { + tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + + (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); + if (tmpi < best_distance) + { + best_distance = tmpi; + best = tmp; } } - if (best != op1) { - retval->distance_x += op1->x-best->x; - retval->distance_y += op1->y-best->y; + if (best != op1) + { + retval->distance_x += op1->x - best->x; + retval->distance_y += op1->y - best->y; } } - retval->part = best; - retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); - retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); + retval->part = best; + retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); + retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); } } @@ -2174,21 +2315,26 @@ * field of the rv_vector is set to NULL. */ -void get_rangevector_from_mapcoord(const mapstruct *m, int x, int y, const object *op2, rv_vector *retval, int flags) { - if (!adjacent_map(m, op2->map, &retval->distance_x, &retval->distance_y)) { - /* be conservative and fill in _some_ data */ - retval->distance = 100000; - retval->distance_x = 32767; - retval->distance_y = 32767; - retval->direction = 0; - retval->part = 0; - } else { - retval->distance_x += op2->x-x; - retval->distance_y += op2->y-y; - - retval->part = NULL; - retval->distance = isqrt(retval->distance_x*retval->distance_x+retval->distance_y*retval->distance_y); - retval->direction = find_dir_2(-retval->distance_x, -retval->distance_y); +void +get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) +{ + if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) + { + /* be conservative and fill in _some_ data */ + retval->distance = 100000; + retval->distance_x = 32767; + retval->distance_y = 32767; + retval->direction = 0; + retval->part = 0; + } + else + { + retval->distance_x += op2->x - x; + retval->distance_y += op2->y - y; + + retval->part = NULL; + retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); + retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); } } @@ -2200,8 +2346,10 @@ * and efficient. This could probably be a macro. * MSW 2001-08-05 */ -int on_same_map(const object *op1, const object *op2) { - int dx, dy; +int +on_same_map (const object *op1, const object *op2) +{ + int dx, dy; - return adjacent_map(op1->map, op2->map, &dx, &dy); + return adjacent_map (op1->map, op2->map, &dx, &dy); }