--- cf.schmorp.de/server/common/map.C 2006/12/20 09:14:21 1.45 +++ cf.schmorp.de/server/common/map.C 2006/12/20 11:36:38 1.46 @@ -224,10 +224,8 @@ { maptile *m; - for (m = first_map; m != NULL; m = m->next) - { - dump_map (m); - } + for (m = first_map; m; m = m->next) + dump_map (m); } /* This rolls up wall, blocks_magic, blocks_view, etc, all into @@ -241,29 +239,28 @@ * don't expect to insert/remove anything from those spaces. */ int -get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 * nx, sint16 * ny) +get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny) { sint16 newx, newy; int retval = 0; maptile *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) + return P_OUT_OF_MAP; + 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; + if (newmap) *newmap = mp; + if (nx) *nx = newx; + if (ny) *ny = newy; - return retval; + return retval | mp->at (newx, newy).flags (); } /* @@ -296,7 +293,7 @@ /* Save some cycles - instead of calling get_map_flags(), just get the value * directly. */ - mflags = m->spaces[sx + m->width * sy].flags; + mflags = m->at (sx, sy).flags (); blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); @@ -1888,21 +1885,14 @@ * through, etc) */ void -update_position (maptile *m, int x, int y) +mapspace::update_ () { object *tmp, *last = 0; - uint8 flags = 0, oldflags, light = 0, anywhere = 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; - 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; @@ -1911,7 +1901,7 @@ top_obj = 0; floor_obj = 0; - for (tmp = GET_MAP_OB (m, x, y); tmp; last = tmp, tmp = tmp->above) + for (tmp = bottom; 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 @@ -1985,21 +1975,12 @@ 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); - - 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; + 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 @@ -2070,28 +2051,11 @@ 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); + 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) { @@ -2140,7 +2104,6 @@ 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. @@ -2152,40 +2115,43 @@ { 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); - } + load_and_link_tiled_map (m, 3); + return (out_of_map (m->tile_map[3], x + MAP_WIDTH (m->tile_map[3]), 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); - } + load_and_link_tiled_map (m, 1); + return (out_of_map (m->tile_map[1], x - MAP_WIDTH (m), 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); - } + 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 >= 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); - } + load_and_link_tiled_map (m, 2); + return (out_of_map (m->tile_map[2], x, y - MAP_HEIGHT (m))); } @@ -2210,37 +2176,43 @@ if (*x < 0) { if (!m->tile_path[3]) - return NULL; + 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)); } + if (*x >= MAP_WIDTH (m)) { if (!m->tile_path[1]) - return NULL; + return 0; + 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 (*y < 0) { if (!m->tile_path[0]) - return NULL; + return 0; + 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 >= MAP_HEIGHT (m)) { if (!m->tile_path[2]) - return NULL; + return 0; + if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) load_and_link_tiled_map (m, 2);