--- deliantra/server/common/map.C 2006/09/16 22:24:12 1.31 +++ deliantra/server/common/map.C 2006/12/20 09:14:21 1.45 @@ -26,15 +26,10 @@ #include #include -#ifndef WIN32 /* ---win32 exclude header */ -# include -#endif /* win32 */ +#include #include "path.h" - -extern int nrofallocobjects, nroffreeobjects; - /* * Returns the maptile which has a name matching the given argument. * return NULL if no match is found. @@ -161,19 +156,14 @@ { char buf[MAX_BUF]; -#ifndef WIN32 char *endbuf; struct stat statbuf; int mode = 0; -#endif 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. @@ -196,7 +186,6 @@ mode |= 2; return (mode); -#endif } /* @@ -277,7 +266,6 @@ return retval; } - /* * Returns true if the given coordinate is blocked except by the * object passed is not blocking. This is used with @@ -290,7 +278,6 @@ * 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) { @@ -338,7 +325,7 @@ * 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) + for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) { /* This must be before the checks below. Code for inventory checkers. */ @@ -412,7 +399,6 @@ * 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) { @@ -452,9 +438,9 @@ * 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; - + return P_NO_PASS; } + return 0; } @@ -501,7 +487,7 @@ for (x = 0; x < MAP_WIDTH (m); x++) for (y = 0; y < MAP_HEIGHT (m); y++) - for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) + for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above) { above = tmp->above; @@ -546,7 +532,7 @@ int unique; object *op, *prev = NULL, *last_more = NULL, *otmp; - op = get_object (); + op = object::create (); op->map = m; /* To handle buttons correctly */ while ((i = load_object (fp, op, mapflags))) @@ -564,29 +550,29 @@ switch (i) { - case LL_NORMAL: - /* if we are loading an overlay, put the floors on the bottom */ - if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) - insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); - else - insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); - - if (op->inv) - sum_weight (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; - break; + case LL_NORMAL: + /* if we are loading an overlay, put the floors on the bottom */ + if ((QUERY_FLAG (op, FLAG_IS_FLOOR) || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)) && mapflags & MAP_OVERLAY) + insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY | INS_MAP_LOAD); + else + insert_ob_in_map (op, m, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); + + if (op->inv) + sum_weight (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; + break; } if (mapflags & MAP_STYLE) remove_from_active_list (op); - op = get_object (); + op = object::create (); op->map = m; } @@ -596,17 +582,18 @@ { unique = 0; /* check for unique items, or unique squares */ - for (otmp = get_map_ob (m, i, j); otmp; otmp = otmp->above) + 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); + op->destroy (); link_multipart_objects (m); } @@ -626,16 +613,13 @@ for (j = 0; j < MAP_HEIGHT (m); j++) { unique = 0; - for (op = get_map_ob (m, i, j); op; op = op->above) + 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; - } + continue; if (op->head || op->owner) continue; @@ -644,9 +628,25 @@ 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 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. + */ + MAP_WIDTH (this) = 16; + MAP_HEIGHT (this) = 16; + MAP_RESET_TIMEOUT (this) = 0; + MAP_TIMEOUT (this) = 300; + MAP_ENTER_X (this) = 0; + MAP_ENTER_Y (this) = 0; + /*set part to -1 indicating conversion to weather map not yet done */ + MAP_WORLDPARTX (this) = -1; + MAP_WORLDPARTY (this) = -1; } /* @@ -654,32 +654,18 @@ * Modified to no longer take a path option which was not being * used anyways. MSW 2001-07-01 */ - maptile * get_linked_map (void) { - maptile *map = new maptile; - maptile *mp; + maptile *mp, *map = new maptile; + + for (mp = first_map; mp && mp->next; mp = mp->next); - for (mp = first_map; mp != NULL && mp->next != NULL; 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; } @@ -688,24 +674,25 @@ * This basically allocates the dynamic array of spaces for the * map. */ - void -allocate_map (maptile *m) +maptile::allocate () { - m->in_memory = MAP_IN_MEMORY; + 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) + if (spaces) { - LOG (llevError, "allocate_map called with already allocated map (%s)\n", m->path); - free (m->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) + if (!spaces) fatal (OUT_OF_MEMORY); } @@ -720,7 +707,8 @@ m->width = sizex; m->height = sizey; m->in_memory = MAP_SWAPPED; - allocate_map (m); + m->allocate (); + return m; } @@ -738,7 +726,7 @@ int i = 0, number_of_entries = 0; const typedata *current_type; - shop_string = strdup_local (input_string); + 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) @@ -857,31 +845,34 @@ int msgpos = 0; int maplorepos = 0; - while (fgets (buf, HUGE_BUF - 1, fp) != NULL) + 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) { - end = strchr (key, '\n'); - if (end != NULL) - { - *end = 0; - } + 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. */ @@ -914,7 +905,7 @@ if (!strcmp (key, "msg")) { - while (fgets (buf, HUGE_BUF - 1, fp) != NULL) + while (fgets (buf, HUGE_BUF, fp) != NULL) { if (!strcmp (buf, "endmsg\n")) break; @@ -931,11 +922,11 @@ * when msgpos is zero, so copying it results in crashes */ if (msgpos != 0) - m->msg = strdup_local (msgbuf); + m->msg = strdup (msgbuf); } else if (!strcmp (key, "maplore")) { - while (fgets (buf, HUGE_BUF - 1, fp) != NULL) + while (fgets (buf, HUGE_BUF, fp) != NULL) { if (!strcmp (buf, "endmaplore\n")) break; @@ -947,7 +938,7 @@ } } if (maplorepos != 0) - m->maplore = strdup_local (maplorebuf); + m->maplore = strdup (maplorebuf); } else if (!strcmp (key, "end")) { @@ -966,122 +957,72 @@ else if (!strcmp (key, "name")) { *end = 0; - m->name = strdup_local (value); + m->name = strdup (value); } /* first strcmp value on these are old names supported * for compatibility reasons. The new values (second) are * what really should be used. */ else if (!strcmp (key, "oid")) - { - fp.get (m, atoi (value)); - } + fp.get (m, atoi (value)); else if (!strcmp (key, "attach")) - { - m->attach = value; - } + m->attach = value; else if (!strcmp (key, "hp") || !strcmp (key, "enter_x")) - { - m->enter_x = atoi (value); - } + m->enter_x = atoi (value); else if (!strcmp (key, "sp") || !strcmp (key, "enter_y")) - { - m->enter_y = atoi (value); - } + m->enter_y = atoi (value); else if (!strcmp (key, "x") || !strcmp (key, "width")) - { - m->width = atoi (value); - } + m->width = atoi (value); else if (!strcmp (key, "y") || !strcmp (key, "height")) - { - m->height = atoi (value); - } + m->height = atoi (value); else if (!strcmp (key, "weight") || !strcmp (key, "reset_timeout")) - { - m->reset_timeout = atoi (value); - } + m->reset_timeout = atoi (value); else if (!strcmp (key, "value") || !strcmp (key, "swap_time")) - { - m->timeout = atoi (value); - } + m->timeout = atoi (value); else if (!strcmp (key, "level") || !strcmp (key, "difficulty")) - { - m->difficulty = atoi (value); - } + m->difficulty = clamp (atoi (value), 1, settings.max_level); else if (!strcmp (key, "invisible") || !strcmp (key, "darkness")) - { - m->darkness = atoi (value); - } + m->darkness = atoi (value); else if (!strcmp (key, "stand_still") || !strcmp (key, "fixed_resettime")) - { - m->fixed_resettime = atoi (value); - } + m->fixed_resettime = atoi (value); else if (!strcmp (key, "unique")) - { - m->unique = atoi (value); - } + m->unique = atoi (value); else if (!strcmp (key, "template")) - { - m->templatemap = atoi (value); - } + m->templatemap = atoi (value); else if (!strcmp (key, "region")) - { - m->region = get_region_by_name (value); - } + 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); - } + m->shopgreed = atof (value); else if (!strcmp (key, "shopmin")) - { - m->shopmin = atol (value); - } + m->shopmin = atol (value); else if (!strcmp (key, "shopmax")) - { - m->shopmax = atol (value); - } + m->shopmax = atol (value); else if (!strcmp (key, "shoprace")) { *end = 0; - m->shoprace = strdup_local (value); + m->shoprace = strdup (value); } else if (!strcmp (key, "outdoor")) - { - m->outdoor = atoi (value); - } + m->outdoor = atoi (value); else if (!strcmp (key, "temp")) - { - m->temp = atoi (value); - } + m->temp = atoi (value); else if (!strcmp (key, "pressure")) - { - m->pressure = atoi (value); - } + m->pressure = atoi (value); else if (!strcmp (key, "humid")) - { - m->humid = atoi (value); - } + m->humid = atoi (value); else if (!strcmp (key, "windspeed")) - { - m->windspeed = atoi (value); - } + m->windspeed = atoi (value); else if (!strcmp (key, "winddir")) - { - m->winddir = atoi (value); - } + m->winddir = atoi (value); else if (!strcmp (key, "sky")) - { - m->sky = atoi (value); - } + m->sky = atoi (value); else if (!strcmp (key, "nosmooth")) - { - m->nosmooth = atoi (value); - } + m->nosmooth = atoi (value); else if (!strncmp (key, "tile_path_", 10)) { int tile = atoi (key + 10); @@ -1124,25 +1065,25 @@ if (editor) { /* Use the value as in the file. */ - m->tile_path[tile - 1] = strdup_local (value); + m->tile_path[tile - 1] = strdup (value); } else if (path != NULL) { /* Use the normalized value. */ - m->tile_path[tile - 1] = strdup_local (path); + 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); - } + LOG (llevError, "Got unknown value in map header: %s %s\n", key, value); } + if (!key || strcmp (key, "end")) { LOG (llevError, "Got premature eof on map header!\n"); return 1; } + return 0; } @@ -1188,7 +1129,7 @@ return NULL; } - allocate_map (m); + m->allocate (); m->in_memory = MAP_LOADING; load_objects (m, thawer, flags & (MAP_BLOCK | MAP_STYLE)); @@ -1244,7 +1185,8 @@ m = load_original_map (m->path, 0); return NULL; } - allocate_map (m); + + m->allocate (); m->in_memory = MAP_LOADING; load_objects (m, thawer, 0); @@ -1279,7 +1221,7 @@ m = load_original_map (m->path, 0); return NULL; } - /*allocate_map(m); */ + /*m->allocate ();*/ m->in_memory = MAP_LOADING; load_objects (m, thawer, MAP_OVERLAY); @@ -1303,18 +1245,22 @@ for (j = 0; j < MAP_HEIGHT (m); j++) { unique = 0; - for (op = get_map_ob (m, i, j); op; op = next) + + 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)) { clean_object (op); + if (QUERY_FLAG (op, FLAG_IS_LINKED)) remove_button_link (op); - remove_ob (op); - free_object (op); + + op->destroy (); } } } @@ -1393,7 +1339,7 @@ else { if (!m->tmpname) - m->tmpname = tempnam_local (settings.tmpdir, NULL); + m->tmpname = tempnam (settings.tmpdir, NULL); strcpy (filename, m->tmpname); } @@ -1427,17 +1373,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) @@ -1526,11 +1465,12 @@ 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); + + tmp->destroy (); } } @@ -1556,7 +1496,9 @@ LOG (llevDebug, "free_all_objects: Link error, bailing out.\n"); break; } + previous_obj = op; + if (op->head != NULL) op = op->head; @@ -1565,8 +1507,8 @@ */ if (m->in_memory == MAP_IN_MEMORY) clean_object (op); - remove_ob (op); - free_object (op); + + op->destroy (); } } } @@ -1586,6 +1528,10 @@ LOG (llevError, "Trying to free freed map.\n"); return; } + + // TODO: use new/delete +#define FREE_AND_CLEAR(p) { free (p); p = NULL; } + if (flag && m->spaces) free_all_objects (m); if (m->name) @@ -1596,21 +1542,29 @@ FREE_AND_CLEAR (m->msg); if (m->maplore) FREE_AND_CLEAR (m->maplore); - if (m->shopitems) - delete[]m->shopitems; + + delete [] m->shopitems; m->shopitems = 0; + 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; + +#undef FREE_AND_CLEAR + } /* @@ -1681,8 +1635,6 @@ delete m; } - - /* * Makes sure the given map is loaded and swapped in. * name is path name of the map. @@ -1694,7 +1646,6 @@ * * Returns a pointer to the given map. */ - maptile * ready_map_name (const char *name, int flags) { @@ -1827,7 +1778,7 @@ 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 (op = GET_MAP_OB (m, x, y); op != NULL; op = op->above) { if (QUERY_FLAG (op, FLAG_MONSTER)) { @@ -1930,7 +1881,6 @@ return 1; } - /* * This function updates various attributes about a specific space * on the map (what it looks like, whether it blocks magic, @@ -1940,7 +1890,7 @@ void update_position (maptile *m, int x, int y) { - object *tmp, *last = NULL; + object *tmp, *last = 0; uint8 flags = 0, oldflags, light = 0, anywhere = 0; New_Face *top, *floor, *middle; object *top_obj, *floor_obj, *middle_obj; @@ -1954,20 +1904,19 @@ } middle = blank_face; - top = blank_face; - floor = blank_face; + top = blank_face; + floor = blank_face; - middle_obj = NULL; - top_obj = NULL; - floor_obj = NULL; + middle_obj = 0; + top_obj = 0; + floor_obj = 0; - for (tmp = get_map_ob (m, x, y); tmp; last = tmp, tmp = tmp->above) + 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 + * 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?) + * it is a dissapation factor that is cubed. */ if (tmp->glow_radius > light) light = tmp->glow_radius; @@ -2015,45 +1964,42 @@ middle_obj = tmp; } } + if (tmp == tmp->above) { LOG (llevError, "Error in structure of map\n"); exit (-1); } - move_slow |= tmp->move_slow; + move_slow |= tmp->move_slow; move_block |= tmp->move_block; - move_on |= tmp->move_on; - move_off |= tmp->move_off; + 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; - - if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) - flags |= P_BLOCKSVIEW; - } /* for stack of objects */ + 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; + } /* 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); + 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); + + mapspace &s = m->at (x, y); + + s.flags = flags; + s.move_block = move_block & ~move_allow; + s.move_on = move_on; + s.move_off = move_off; + s.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 @@ -2117,25 +2063,31 @@ } } } + 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); } @@ -2150,7 +2102,7 @@ timeout = MAP_DEFAULTRESET; if (timeout >= MAP_MAXRESET) timeout = MAP_MAXRESET; - MAP_WHEN_RESET (map) = seconds () + timeout; + MAP_WHEN_RESET (map) = time (0) + timeout; } /* this updates the orig_map->tile_map[tile_num] value after loading