--- deliantra/server/common/map.C 2007/01/15 21:06:18 1.76 +++ deliantra/server/common/map.C 2007/02/15 15:43:36 1.86 @@ -22,12 +22,13 @@ * The authors can be reached via e-mail at */ -#include -#include - -#include #include +#include "global.h" +#include "funcpoint.h" + +#include "loader.h" + #include "path.h" /* @@ -69,9 +70,9 @@ int mode = 0; if (prepend_dir) - strcpy (buf, create_pathname (name)); + assign (buf, create_pathname (name)); else - strcpy (buf, name); + assign (buf, name); /* old method (strchr(buf, '\0')) seemd very odd to me - * this method should be equivalant and is clearer. @@ -230,7 +231,6 @@ return 0; } - /* * Returns true if the given object can't fit in the given spot. * This is meant for multi space objects - for single space objecs, @@ -571,14 +571,13 @@ in_memory = MAP_SWAPPED; /* The maps used to pick up default x and y values from the - * map archetype. Mimic that behaviour. + * map archetype. Mimic that behaviour. */ - width = 16; - height = 16; - reset_timeout = 0; - timeout = 300; - enter_x = 0; - enter_y = 0; + width = 16; + height = 16; + timeout = 300; + max_nrof = 1000; // 1000 items of anything + max_volume = 2000000; // 2m³ } maptile::maptile (int w, int h) @@ -742,18 +741,6 @@ switch (kw) { - case KW_EOF: - LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); - return false; - - case KW_end: - return true; - - default: - case KW_ERROR: - LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); - break; - case KW_msg: thawer.get_ml (KW_endmsg, msg); break; @@ -795,7 +782,7 @@ case KW_per_player: thawer.get (per_player); break; case KW_per_party: thawer.get (per_party); break; - case KW_region: get_region_by_name (thawer.get_str ()); break; + case KW_region: default_region = region::find (thawer.get_str ()); break; case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; // old names new names @@ -813,6 +800,14 @@ case KW_tile_path_2: thawer.get (tile_path [1]); break; case KW_tile_path_3: thawer.get (tile_path [2]); break; case KW_tile_path_4: thawer.get (tile_path [3]); break; + + case KW_end: + return true; + + default: + if (!thawer.parse_error (kw, "map", 0)) + return false; + break; } } @@ -874,7 +869,7 @@ MAP_OUT (fixed_resettime); MAP_OUT (difficulty); - if (region) MAP_OUT2 (region, region->name); + if (default_region) MAP_OUT2 (region, default_region->name); if (shopitems) { @@ -935,20 +930,23 @@ void maptile::clear () { - if (!spaces) - return; + sfree (regions, size ()), regions = 0; + free (regionmap), regionmap = 0; - for (mapspace *ms = spaces + size (); ms-- > spaces; ) - while (object *op = ms->bot) - { - if (op->head) - op = op->head; + if (spaces) + { + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + while (object *op = ms->bot) + { + if (op->head) + op = op->head; - op->destroy_inv (false); - op->destroy (); - } + op->destroy_inv (false); + op->destroy (); + } - sfree (spaces, size ()), spaces = 0; + sfree (spaces, size ()), spaces = 0; + } if (buttons) free_objectlinkpt (buttons), buttons = 0; @@ -1113,7 +1111,7 @@ { object *tmp, *last = 0; uint8 flags = P_UPTODATE, light = 0, anywhere = 0; - New_Face *top, *floor, *middle; + facetile *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; @@ -1280,6 +1278,17 @@ faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; } +uint64 +mapspace::volume () const +{ + uint64 vol = 0; + + for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below) + vol += op->volume (); + + return vol; +} + /* this updates the orig_map->tile_map[tile_num] value after finding * the map. It also takes care of linking back the freshly found * maps tile_map values if it tiles back to this one. It returns @@ -1452,7 +1461,7 @@ * Return whether map2 is adjacent to map1. If so, store the distance from * map1 to map2 in dx/dy. */ -static int +int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) { if (!map1 || !map2) @@ -1553,7 +1562,7 @@ * creature is. get_rangevector takes into account map tiling, * so you just can not look the the map coordinates and get the * righte value. distance_x/y are distance away, which - * can be negativbe. direction is the crossfire direction scheme + * can be negative. direction is the crossfire direction scheme * that the creature should head. part is the part of the * monster that is closest. * @@ -1574,9 +1583,9 @@ 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->distance = 10000; + retval->distance_x = 10000; + retval->distance_y = 10000; retval->direction = 0; retval->part = 0; } @@ -1591,7 +1600,6 @@ /* 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 @@ -1600,7 +1608,7 @@ * same axis as is used for multipart objects, the simply arithmetic * below works. */ - for (tmp = op1->more; tmp != NULL; tmp = tmp->more) + for (object *tmp = op1->more; tmp; 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); @@ -1619,7 +1627,7 @@ } retval->part = best; - retval->distance = idistance (retval->distance_x, retval->distance_y); + retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); } } @@ -1634,9 +1642,8 @@ * for something in the future. Also, since no object is pasted, the best * field of the rv_vector is set to NULL. */ - void -get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) +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)) { @@ -1683,3 +1690,19 @@ return insert_ob_in_map_at (op, this, originator, flags, x, y); } +region * +maptile::region (int x, int y) const +{ + if (regions + && regionmap + && !OUT_OF_REAL_MAP (this, x, y)) + if (struct region *reg = regionmap [regions [y * width + x]]) + return reg; + + if (default_region) + return default_region; + + return ::region::default_region (); +} + +