--- deliantra/server/socket/request.C 2007/03/14 00:04:59 1.73 +++ deliantra/server/socket/request.C 2007/03/18 03:05:41 1.82 @@ -134,6 +134,8 @@ { memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); + pl->ns->force_newmap = false; + if (pl->ns->newmapcmd == 1) pl->ns->send_packet ("newmap"); @@ -148,11 +150,17 @@ object *ob = pl->ob; char buf[MAX_BUF]; /* eauugggh */ - if (socket.current_map != ob->map) + if (socket.force_newmap) { + // force newmap is used for clients that do not redraw their map + // after image uploads. socket.current_map = ob->map; - clear_map (pl); + } + else if (socket.current_map != ob->map) + { + clear_map (pl); + socket.current_map = ob->map; if (socket.mapinfocmd) { @@ -461,6 +469,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 */ @@ -563,8 +572,43 @@ * it either has to be here or init_sockets needs to be exported. */ void -AddMeCmd (char *buf, int len, client * ns) +AddMeCmd (char *buf, int len, client *ns) { + // face caching is mandatory + if (!ns->facecache) + { + ns->send_drawinfo ( + "\n" + "\n" + "***\n" + "*** WARNING:\n" + "*** Your client does not support face/image caching,\n" + "*** or it has been disabled. Face caching is mandatory\n" + "*** so please enable it or use a newer client.\n" + "***\n" + "*** Look at your client preferences:\n" + "***\n" + "*** CFPlus: all known versions automatically enable the facecache.\n" + "*** cfclient: use the -cache commandline option.\n" + "*** cfclient: map will not redraw automatically (bug).\n" + "*** gcfclient: use -cache commandline option, or enable\n" + "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n" + "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n" + "***\n" + "***\n", + NDI_RED + ); + + if (strstr (ns->version, "jcrossclient")) + /* let them, for now*/; + else + { + ns->flush (); + //ns->destroy (); + } + //ns->facecache = true; + } + INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); } @@ -685,13 +729,23 @@ } /** + * client requested an image. send it rate-limited + * before flushing. + */ +void +AskFaceCmd (char *buf, int len, client *ns) +{ + ns->askface.push_back (atoi (buf)); +} + +/** * Tells client the picture it has to use * to smooth a picture number given as argument. */ void AskSmooth (char *buf, int len, client *ns) { - ns->send_smooth (atoi (buf)); + ns->send_face (atoi (buf)); } /** @@ -926,7 +980,7 @@ * it needs to send something back (vs just printing out a message) */ void -send_query (client *ns, uint8 flags, char *text) +send_query (client *ns, uint8 flags, const char *text) { ns->send_packet_printf ("query %d %s", flags, text ? text : ""); } @@ -1083,13 +1137,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 +1159,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 +1168,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,22 +1178,16 @@ * 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] & NS_FACESENT_FACE)) + if (!ns.faces_sent[face_num]) if (ob) ns.send_faces (ob); else @@ -1157,56 +1202,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) - { - if (smoothlevel) - ns.send_smooth (ob->face); - - 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. @@ -1311,13 +1306,6 @@ estartlen = esl.length (); } - else - { - /* suppress compiler warnings */ - ewhatstart = 0; - ewhatflag = 0; - estartlen = 0; - } /* x,y are the real map locations. ax, ay are viewport relative * locations. @@ -1330,6 +1318,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; @@ -1345,7 +1335,7 @@ */ nx = x; ny = y; - m = get_map_from_coord (pl->map, &nx, &ny); + m = get_map_from_coord (plmap, &nx, &ny); if (!m) { @@ -1416,9 +1406,6 @@ sl << uint16 (mask); - if (socket.ext_mapinfos) - esl << uint16 (emask); - unsigned char dummy; unsigned char *last_ext = &dummy; @@ -1439,6 +1426,8 @@ lastcell.count = d; + mapspace &ms = m->at (nx, ny); + if (socket.extmap) { uint8 stat_hp = 0; @@ -1447,7 +1436,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 @@ -1511,43 +1500,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. @@ -1559,10 +1536,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 */