ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.74 by root, Wed Mar 14 01:19:10 2007 UTC vs.
Revision 1.79 by root, Thu Mar 15 16:25:45 2007 UTC

… …
132static void 132static void
133clear_map (player *pl) 133clear_map (player *pl)
134{ 134{
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false;
138
137 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
139 141
140 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
141} 143}
… …
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->ob;
149 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.force_newmap && 0)
152 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
153 socket.current_map = ob->map; 157 socket.current_map = ob->map;
154 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
155 clear_map (pl); 162 clear_map (pl);
156 163
157 if (socket.mapinfocmd) 164 if (socket.mapinfocmd)
158 { 165 {
159 if (ob->map && ob->map->path[0]) 166 if (ob->map && ob->map->path[0])
… …
459 char tmpbuf[20]; 466 char tmpbuf[20];
460 int q = atoi (param); 467 int q = atoi (param);
461 468
462 if (is_valid_faceset (q)) 469 if (is_valid_faceset (q))
463 ns->faceset = q; 470 ns->faceset = q;
471
464 sprintf (tmpbuf, "%d", ns->faceset); 472 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */ 474 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1; 475 ns->image2 = 1;
468 } 476 }
… …
561 * This is what takes care of it. We tell the client how things worked out. 569 * This is what takes care of it. We tell the client how things worked out.
562 * I am not sure if this file is the best place for this function. however, 570 * I am not sure if this file is the best place for this function. however,
563 * it either has to be here or init_sockets needs to be exported. 571 * it either has to be here or init_sockets needs to be exported.
564 */ 572 */
565void 573void
566AddMeCmd (char *buf, int len, client * ns) 574AddMeCmd (char *buf, int len, client *ns)
567{ 575{
576 // face caching is mandatory
577 if (!ns->facecache)
578 {
579 ns->send_drawinfo (
580 "\n"
581 "\n"
582 "***\n"
583 "*** WARNING:\n"
584 "*** Your client does not support face/image caching,\n"
585 "*** or it has been disabled. Face caching is mandatory\n"
586 "*** so please enable it or use a newer client.\n"
587 "***\n"
588 "*** Look at your client preferences:\n"
589 "***\n"
590 "*** CFPlus: all known versions automatically enable the facecache.\n"
591 "*** cfclient: use the -cache commandline option.\n"
592 "*** cfclient: map will not redraw automatically (bug).\n"
593 "*** gcfclient: use -cache commandline option, or enable\n"
594 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
595 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
596 "***\n"
597 "***\n",
598 NDI_RED
599 );
600
601 if (strstr (ns->version, "jcrossclient"))
602 /* let them, for now*/;
603 else
604 {
605 ns->flush ();
606 //ns->destroy ();
607 }
608 //ns->facecache = true;
609 }
610
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 611 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 612}
570 613
571/** Reply to ExtendedInfos command */ 614/** Reply to ExtendedInfos command */
572void 615void
… …
680 snprintf (temp, sizeof (temp), "%d", i); 723 snprintf (temp, sizeof (temp), "%d", i);
681 strcat (cmdback, temp); 724 strcat (cmdback, temp);
682 } 725 }
683 726
684 ns->send_packet (cmdback); 727 ns->send_packet (cmdback);
728}
729
730/**
731 * client requested an image. send it rate-limited
732 * before flushing.
733 */
734void
735AskFaceCmd (char *buf, int len, client *ns)
736{
737 ns->askface.push_back (atoi (buf));
685} 738}
686 739
687/** 740/**
688 * Tells client the picture it has to use 741 * Tells client the picture it has to use
689 * to smooth a picture number given as argument. 742 * to smooth a picture number given as argument.
… …
1081 1134
1082/** Clears a map cell */ 1135/** Clears a map cell */
1083static void 1136static void
1084map_clearcell (struct MapCell *cell, int count) 1137map_clearcell (struct MapCell *cell, int count)
1085{ 1138{
1086 cell->faces[0] = 0; 1139 cell->faces[0] = 0;
1087 cell->faces[1] = 0; 1140 cell->faces[1] = 0;
1088 cell->faces[2] = 0; 1141 cell->faces[2] = 0;
1142 cell->smooth[0] = 0;
1143 cell->smooth[1] = 0;
1144 cell->smooth[2] = 0;
1089 cell->count = count; 1145 cell->count = count;
1090 cell->stat_hp = 0; 1146 cell->stat_hp = 0;
1091 cell->flags = 0; 1147 cell->flags = 0;
1092 cell->player = 0; 1148 cell->player = 0;
1093} 1149}
1094 1150
1095#define MAX_LAYERS 3 1151#define MAX_LAYERS 3
1096 1152
1097/** 1153/**
… …
1100 * it was. 1156 * it was.
1101 * sl is the socklist this data is going into. 1157 * sl is the socklist this data is going into.
1102 * ns is the socket we are working on - all the info we care 1158 * ns is the socket we are working on - all the info we care
1103 * about is in this socket structure, so now need not pass the 1159 * about is in this socket structure, so now need not pass the
1104 * entire player object. 1160 * entire player object.
1105 * mx and my are map coordinate offsets for map mp
1106 * sx and sy are the offsets into the socket structure that
1107 * holds the old values.
1108 * layer is the layer to update, with 2 being the floor and 0 the 1161 * layer is the layer to update, with 2 being the floor and 0 the
1109 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1162 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1110 * take. Interesting to note that before this function, the map1 function 1163 * take. Interesting to note that before this function, the map1 function
1111 * numbers the spaces differently - I think this was a leftover from 1164 * numbers the spaces differently - I think this was a leftover from
1112 * the map command, where the faces stack up. Sinces that is no longer 1165 * the map command, where the faces stack up. Sinces that is no longer
1113 * the case, it seems to make more sense to have these layer values 1166 * the case, it seems to make more sense to have these layer values
1114 * actually match. 1167 * actually match.
1115 */ 1168 */
1116static int 1169static int
1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1170update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1118{ 1171{
1119 uint16 face_num; 1172 object *ob = ms.faces_obj [layer];
1120 int bx, by, i;
1121
1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1123 1173
1124 /* If there is no object for this space, or if the face for the object 1174 /* If there is no object for this space, or if the face for the object
1125 * is the blank face, set the face number to zero. 1175 * is the blank face, set the face number to zero.
1126 * else if we have the stored head object for this space, that takes 1176 * else if we have the stored head object for this space, that takes
1127 * precedence over the other object for this space. 1177 * precedence over the other object for this space.
1128 * otherwise, we do special head processing 1178 * otherwise, we do special head processing
1129 */ 1179 */
1130 if (!ob || ob->face == blank_face) 1180 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1131 face_num = 0;
1132 else
1133 /* In this case, we are already at the lower right or single part object,
1134 * so nothing special
1135 */
1136 face_num = ob->face;
1137 1181
1138 /* We've gotten what face we want to use for the object. Now see if 1182 /* We've gotten what face we want to use for the object. Now see if
1139 * if it has changed since we last sent it to the client. 1183 * if it has changed since we last sent it to the client.
1140 */ 1184 */
1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1185 if (lastcell.faces[layer] != face_num)
1142 { 1186 {
1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1187 lastcell.faces[layer] = face_num;
1144 1188
1145 if (!ns.faces_sent[face_num]) 1189 if (!ns.faces_sent[face_num])
1146 if (ob) 1190 if (ob)
1147 ns.send_faces (ob); 1191 ns.send_faces (ob);
1148 else 1192 else
1149 ns.send_face (face_num); 1193 ns.send_face (face_num);
1150 1194
1151 sl << uint16 (face_num); 1195 sl << uint16 (face_num);
1152 return 1;
1153 }
1154
1155 /* Nothing changed */
1156 return 0;
1157}
1158
1159/**
1160 * This function is mainly a copy of update_space,
1161 * except it handles update of the smoothing updates,
1162 * not the face updates.
1163 * Removes the need to replicate the same code for each layer.
1164 * this returns true if this smooth is now in fact different
1165 * than it was.
1166 * sl is the socklist this data is going into.
1167 * ns is the socket we are working on - all the info we care
1168 * about is in this socket structure, so know need to pass the
1169 * entire player object.
1170 * mx and my are map coordinate offsets for map mp
1171 * sx and sy are the offsets into the socket structure that
1172 * holds the old values.
1173 * layer is the layer to update, with 2 being the floor and 0 the
1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1175 * take.
1176 */
1177static inline int
1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1179{
1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1181
1182 /* If there is no object for this space, or if the face for the object
1183 * is the blank face, set the smoothlevel to zero.
1184 */
1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1186
1187 /* We've gotten what face we want to use for the object. Now see if
1188 * if it has changed since we last sent it to the client.
1189 */
1190 if (smoothlevel > 255)
1191 smoothlevel = 255;
1192 else if (smoothlevel < 0)
1193 smoothlevel = 0;
1194
1195 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1196 {
1197 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1198 sl << uint8 (smoothlevel);
1199 return 1; 1196 return 1;
1200 } 1197 }
1201 1198
1202 /* Nothing changed */ 1199 /* Nothing changed */
1203 return 0; 1200 return 0;
… …
1306 << uint8 (extendedinfos) 1303 << uint8 (extendedinfos)
1307 << uint8 (eentrysize); 1304 << uint8 (eentrysize);
1308 1305
1309 estartlen = esl.length (); 1306 estartlen = esl.length ();
1310 } 1307 }
1311 else
1312 {
1313 /* suppress compiler warnings */
1314 ewhatstart = 0;
1315 ewhatflag = 0;
1316 estartlen = 0;
1317 }
1318 1308
1319 /* x,y are the real map locations. ax, ay are viewport relative 1309 /* x,y are the real map locations. ax, ay are viewport relative
1320 * locations. 1310 * locations.
1321 */ 1311 */
1322 ay = 0; 1312 ay = 0;
… …
1325 * but that started to get a bit messy to look at. 1315 * but that started to get a bit messy to look at.
1326 */ 1316 */
1327 max_x = pl->x + (socket.mapx + 1) / 2; 1317 max_x = pl->x + (socket.mapx + 1) / 2;
1328 max_y = pl->y + (socket.mapy + 1) / 2; 1318 max_y = pl->y + (socket.mapy + 1) / 2;
1329 1319
1320 maptile *plmap = pl->map;
1321
1330 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1322 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1331 { 1323 {
1332 ax = 0; 1324 ax = 0;
1333 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1325 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1334 { 1326 {
… …
1340 /* If the coordinates are not valid, or it is too dark to see, 1332 /* If the coordinates are not valid, or it is too dark to see,
1341 * we tell the client as such 1333 * we tell the client as such
1342 */ 1334 */
1343 nx = x; 1335 nx = x;
1344 ny = y; 1336 ny = y;
1345 m = get_map_from_coord (pl->map, &nx, &ny); 1337 m = get_map_from_coord (plmap, &nx, &ny);
1346 1338
1347 if (!m) 1339 if (!m)
1348 { 1340 {
1349 /* space is out of map. Update space and clear values 1341 /* space is out of map. Update space and clear values
1350 * if this hasn't already been done. If the space is out 1342 * if this hasn't already been done. If the space is out
… …
1411 oldlen = sl.length (); 1403 oldlen = sl.length ();
1412 eoldlen = esl.length (); 1404 eoldlen = esl.length ();
1413 1405
1414 sl << uint16 (mask); 1406 sl << uint16 (mask);
1415 1407
1416 if (socket.ext_mapinfos)
1417 esl << uint16 (emask);
1418
1419 unsigned char dummy; 1408 unsigned char dummy;
1420 unsigned char *last_ext = &dummy; 1409 unsigned char *last_ext = &dummy;
1421 1410
1422 /* Darkness changed */ 1411 /* Darkness changed */
1423 if (lastcell.count != d && socket.darkness) 1412 if (lastcell.count != d && socket.darkness)
… …
1434 sl << uint8 (255 - 64 * d); 1423 sl << uint8 (255 - 64 * d);
1435 } 1424 }
1436 1425
1437 lastcell.count = d; 1426 lastcell.count = d;
1438 1427
1428 mapspace &ms = m->at (nx, ny);
1429
1439 if (socket.extmap) 1430 if (socket.extmap)
1440 { 1431 {
1441 uint8 stat_hp = 0; 1432 uint8 stat_hp = 0;
1442 uint8 stat_width = 0; 1433 uint8 stat_width = 0;
1443 uint8 flags = 0; 1434 uint8 flags = 0;
1444 UUID player = 0; 1435 UUID player = 0;
1445 1436
1446 // send hp information, if applicable 1437 // send hp information, if applicable
1447 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1438 if (object *op = ms.faces_obj [0])
1448 { 1439 {
1449 if (op->head || op->invisible) 1440 if (op->head || op->invisible)
1450 ; // do not show 1441 ; // do not show
1451 else if (op->type == PLAYER 1442 else if (op->type == PLAYER
1452 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1443 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1506 sl << uint8 (8) << uint8 (flags); 1497 sl << uint8 (8) << uint8 (flags);
1507 } 1498 }
1508 } 1499 }
1509 1500
1510 /* Floor face */ 1501 /* Floor face */
1511 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1502 if (update_space (sl, socket, ms, lastcell, 2))
1512 mask |= 0x4; 1503 mask |= 0x4;
1513 1504
1514 if (socket.EMI_smooth)
1515 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1516 emask |= 0x4;
1517
1518 /* Middle face */ 1505 /* Middle face */
1519 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1506 if (update_space (sl, socket, ms, lastcell, 1))
1520 mask |= 0x2; 1507 mask |= 0x2;
1521 1508
1522 if (socket.EMI_smooth) 1509 if (ms.player () == pl
1523 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1510 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1524 emask |= 0x2;
1525
1526 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1527 { 1511 {
1512 // force player to be visible to himself if invisible
1528 if (lastcell.faces[0] != pl->face) 1513 if (lastcell.faces[0] != pl->face)
1529 { 1514 {
1530 lastcell.faces[0] = pl->face; 1515 lastcell.faces[0] = pl->face;
1516
1531 mask |= 0x1; 1517 mask |= 0x1;
1518 sl << uint16 (pl->face);
1532 1519
1533 socket.send_faces (pl); 1520 socket.send_faces (pl);
1534
1535 sl << uint16 (pl->face);
1536 } 1521 }
1537 } 1522 }
1538 else
1539 {
1540 /* Top face */ 1523 /* Top face */
1541 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1524 else if (update_space (sl, socket, ms, lastcell, 0))
1542 mask |= 0x1; 1525 mask |= 0x1;
1543
1544 if (socket.EMI_smooth)
1545 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1546 emask |= 0x1;
1547 } 1526
1548 1527
1549 /* Check to see if we are in fact sending anything for this 1528 /* Check to see if we are in fact sending anything for this
1550 * space by checking the mask. If so, update the mask. 1529 * space by checking the mask. If so, update the mask.
1551 * if not, reset the len to that from before adding the mask 1530 * if not, reset the len to that from before adding the mask
1552 * value, so we don't send those bits. 1531 * value, so we don't send those bits.
… …
1554 if (mask & 0xf) 1533 if (mask & 0xf)
1555 sl[oldlen + 1] = mask & 0xff; 1534 sl[oldlen + 1] = mask & 0xff;
1556 else 1535 else
1557 sl.reset (oldlen); 1536 sl.reset (oldlen);
1558 1537
1538 if (socket.ext_mapinfos)
1539 esl << uint16 (emask);
1540
1541 if (socket.EMI_smooth)
1542 {
1543 for (int layer = 2+1; layer--; )
1544 {
1545 object *ob = ms.faces_obj [layer];
1546
1547 // If there is no object for this space, or if the face for the object
1548 // is the blank face, set the smoothlevel to zero.
1549 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1550
1551 // We've gotten what face we want to use for the object. Now see if
1552 // if it has changed since we last sent it to the client.
1553 if (lastcell.smooth[layer] != smoothlevel)
1554 {
1555 lastcell.smooth[layer] = smoothlevel;
1556 esl << uint8 (smoothlevel);
1557 emask |= 1 << layer;
1558 }
1559 }
1560
1559 if (emask & 0xf) 1561 if (emask & 0xf)
1560 esl[eoldlen + 1] = emask & 0xff; 1562 esl[eoldlen + 1] = emask & 0xff;
1561 else 1563 else
1562 esl.reset (eoldlen); 1564 esl.reset (eoldlen);
1565 }
1563 } /* else this is a viewable space */ 1566 } /* else this is a viewable space */
1564 } /* for x loop */ 1567 } /* for x loop */
1565 } /* for y loop */ 1568 } /* for y loop */
1566 1569
1567 /* Verify that we in fact do need to send this */ 1570 /* Verify that we in fact do need to send this */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines