--- deliantra/server/socket/request.C 2007/03/14 01:19:10 1.74 +++ deliantra/server/socket/request.C 2007/03/14 13:05:30 1.76 @@ -461,6 +461,7 @@ if (is_valid_faceset (q)) ns->faceset = q; + sprintf (tmpbuf, "%d", ns->faceset); safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); /* if the client is using faceset, it knows about image2 command */ @@ -1083,13 +1084,16 @@ static void map_clearcell (struct MapCell *cell, int count) { - cell->faces[0] = 0; - cell->faces[1] = 0; - cell->faces[2] = 0; - cell->count = count; - cell->stat_hp = 0; - cell->flags = 0; - cell->player = 0; + cell->faces[0] = 0; + cell->faces[1] = 0; + cell->faces[2] = 0; + cell->smooth[0] = 0; + cell->smooth[1] = 0; + cell->smooth[2] = 0; + cell->count = count; + cell->stat_hp = 0; + cell->flags = 0; + cell->player = 0; } #define MAX_LAYERS 3 @@ -1102,9 +1106,6 @@ * ns is the socket we are working on - all the info we care * about is in this socket structure, so now need not pass the * entire player object. - * mx and my are map coordinate offsets for map mp - * sx and sy are the offsets into the socket structure that - * holds the old values. * layer is the layer to update, with 2 being the floor and 0 the * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) * take. Interesting to note that before this function, the map1 function @@ -1114,12 +1115,9 @@ * actually match. */ static int -update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) +update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) { - uint16 face_num; - int bx, by, i; - - object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); + object *ob = ms.faces_obj [layer]; /* If there is no object for this space, or if the face for the object * is the blank face, set the face number to zero. @@ -1127,20 +1125,14 @@ * precedence over the other object for this space. * otherwise, we do special head processing */ - if (!ob || ob->face == blank_face) - face_num = 0; - else - /* In this case, we are already at the lower right or single part object, - * so nothing special - */ - face_num = ob->face; + uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; /* We've gotten what face we want to use for the object. Now see if * if it has changed since we last sent it to the client. */ - if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) + if (lastcell.faces[layer] != face_num) { - ns.lastmap.cells[sx][sy].faces[layer] = face_num; + lastcell.faces[layer] = face_num; if (!ns.faces_sent[face_num]) if (ob) @@ -1157,53 +1149,6 @@ } /** - * This function is mainly a copy of update_space, - * except it handles update of the smoothing updates, - * not the face updates. - * Removes the need to replicate the same code for each layer. - * this returns true if this smooth is now in fact different - * than it was. - * sl is the socklist this data is going into. - * ns is the socket we are working on - all the info we care - * about is in this socket structure, so know need to pass the - * entire player object. - * mx and my are map coordinate offsets for map mp - * sx and sy are the offsets into the socket structure that - * holds the old values. - * layer is the layer to update, with 2 being the floor and 0 the - * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ - * take. - */ -static inline int -update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) -{ - object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); - - /* If there is no object for this space, or if the face for the object - * is the blank face, set the smoothlevel to zero. - */ - int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; - - /* We've gotten what face we want to use for the object. Now see if - * if it has changed since we last sent it to the client. - */ - if (smoothlevel > 255) - smoothlevel = 255; - else if (smoothlevel < 0) - smoothlevel = 0; - - if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) - { - ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; - sl << uint8 (smoothlevel); - return 1; - } - - /* Nothing changed */ - return 0; -} - -/** * Returns the size of a data for a map square as returned by * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries * available. @@ -1327,6 +1272,8 @@ max_x = pl->x + (socket.mapx + 1) / 2; max_y = pl->y + (socket.mapy + 1) / 2; + maptile *plmap = pl->map; + for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) { ax = 0; @@ -1342,7 +1289,7 @@ */ nx = x; ny = y; - m = get_map_from_coord (pl->map, &nx, &ny); + m = get_map_from_coord (plmap, &nx, &ny); if (!m) { @@ -1413,9 +1360,6 @@ sl << uint16 (mask); - if (socket.ext_mapinfos) - esl << uint16 (emask); - unsigned char dummy; unsigned char *last_ext = &dummy; @@ -1436,6 +1380,8 @@ lastcell.count = d; + mapspace &ms = m->at (nx, ny); + if (socket.extmap) { uint8 stat_hp = 0; @@ -1444,7 +1390,7 @@ UUID player = 0; // send hp information, if applicable - if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) + if (object *op = ms.faces_obj [0]) { if (op->head || op->invisible) ; // do not show @@ -1508,43 +1454,31 @@ } /* Floor face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) + if (update_space (sl, socket, ms, lastcell, 2)) mask |= 0x4; - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) - emask |= 0x4; - /* Middle face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) + if (update_space (sl, socket, ms, lastcell, 1)) mask |= 0x2; - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) - emask |= 0x2; - - if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) + if (ms.player () == pl + && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) { + // force player to be visible to himself if invisible if (lastcell.faces[0] != pl->face) { lastcell.faces[0] = pl->face; + mask |= 0x1; + sl << uint16 (pl->face); socket.send_faces (pl); - - sl << uint16 (pl->face); } } - else - { - /* Top face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) - mask |= 0x1; - - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) - emask |= 0x1; - } + /* Top face */ + else if (update_space (sl, socket, ms, lastcell, 0)) + mask |= 0x1; + /* Check to see if we are in fact sending anything for this * space by checking the mask. If so, update the mask. @@ -1556,10 +1490,34 @@ else sl.reset (oldlen); - if (emask & 0xf) - esl[eoldlen + 1] = emask & 0xff; - else - esl.reset (eoldlen); + if (socket.ext_mapinfos) + esl << uint16 (emask); + + if (socket.EMI_smooth) + { + for (int layer = 2+1; layer--; ) + { + object *ob = ms.faces_obj [layer]; + + // If there is no object for this space, or if the face for the object + // is the blank face, set the smoothlevel to zero. + int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; + + // We've gotten what face we want to use for the object. Now see if + // if it has changed since we last sent it to the client. + if (lastcell.smooth[layer] != smoothlevel) + { + lastcell.smooth[layer] = smoothlevel; + esl << uint8 (smoothlevel); + emask |= 1 << layer; + } + } + + if (emask & 0xf) + esl[eoldlen + 1] = emask & 0xff; + else + esl.reset (eoldlen); + } } /* else this is a viewable space */ } /* for x loop */ } /* for y loop */