… | |
… | |
97 | * complexities for the client, and probably doesn't make |
97 | * complexities for the client, and probably doesn't make |
98 | * that much difference in bandwidth. |
98 | * that much difference in bandwidth. |
99 | */ |
99 | */ |
100 | mx = ns->mapx; |
100 | mx = ns->mapx; |
101 | my = ns->mapy; |
101 | my = ns->mapy; |
102 | |
|
|
103 | if (ns->mapmode == Map1aCmd) |
|
|
104 | { |
|
|
105 | mx += MAX_HEAD_OFFSET; |
|
|
106 | my += MAX_HEAD_OFFSET; |
|
|
107 | } |
|
|
108 | |
102 | |
109 | /* the x and y here are coordinates for the new map, i.e. if we moved |
103 | /* the x and y here are coordinates for the new map, i.e. if we moved |
110 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
104 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
111 | * if the destination x or y coordinate is outside the viewable |
105 | * if the destination x or y coordinate is outside the viewable |
112 | * area, we clear the values - otherwise, the old values |
106 | * area, we clear the values - otherwise, the old values |
… | |
… | |
437 | } |
431 | } |
438 | else if (!strcmp (cmd, "newmapcmd")) |
432 | else if (!strcmp (cmd, "newmapcmd")) |
439 | { |
433 | { |
440 | ns->newmapcmd = atoi (param); |
434 | ns->newmapcmd = atoi (param); |
441 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
435 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
442 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
443 | // ns->plugincmd = atoi(param); |
|
|
444 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
445 | } |
436 | } |
446 | else if (!strcmp (cmd, "mapinfocmd")) |
437 | else if (!strcmp (cmd, "mapinfocmd")) |
447 | { |
438 | { |
448 | ns->mapinfocmd = atoi (param); |
439 | ns->mapinfocmd = atoi (param); |
449 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
440 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
… | |
… | |
505 | if (*cp == 'x' || *cp == 'X') |
496 | if (*cp == 'x' || *cp == 'X') |
506 | { |
497 | { |
507 | y = atoi (cp + 1); |
498 | y = atoi (cp + 1); |
508 | break; |
499 | break; |
509 | } |
500 | } |
|
|
501 | |
510 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
502 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
511 | { |
503 | { |
512 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
504 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
513 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
505 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
514 | } |
506 | } |
… | |
… | |
691 | |
683 | |
692 | ns->send_packet (cmdback); |
684 | ns->send_packet (cmdback); |
693 | } |
685 | } |
694 | |
686 | |
695 | /** |
687 | /** |
696 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
|
|
697 | * Basically, it makes no sense to wait for the client to request a |
|
|
698 | * a piece of data from us that we know the client wants. So |
|
|
699 | * if we know the client wants it, might as well push it to the |
|
|
700 | * client. |
|
|
701 | */ |
|
|
702 | static void |
|
|
703 | SendSmooth (client *ns, uint16 face) |
|
|
704 | { |
|
|
705 | uint16 smoothface; |
|
|
706 | |
|
|
707 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
708 | * again. |
|
|
709 | */ |
|
|
710 | if (!FindSmooth (face, &smoothface)) |
|
|
711 | { |
|
|
712 | |
|
|
713 | LOG (llevError, "could not findsmooth for %d.\n", face); |
|
|
714 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
715 | return; |
|
|
716 | } |
|
|
717 | |
|
|
718 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
719 | esrv_send_face (ns, smoothface, 0); |
|
|
720 | |
|
|
721 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
722 | |
|
|
723 | packet sl ("smooth"); |
|
|
724 | |
|
|
725 | sl << uint16 (face) |
|
|
726 | << uint16 (smoothface); |
|
|
727 | |
|
|
728 | ns->send_packet (sl); |
|
|
729 | } |
|
|
730 | |
|
|
731 | /** |
|
|
732 | * Tells client the picture it has to use |
688 | * Tells client the picture it has to use |
733 | * to smooth a picture number given as argument. |
689 | * to smooth a picture number given as argument. |
734 | */ |
690 | */ |
735 | void |
691 | void |
736 | AskSmooth (char *buf, int len, client *ns) |
692 | AskSmooth (char *buf, int len, client *ns) |
737 | { |
693 | { |
738 | SendSmooth (ns, atoi (buf)); |
694 | ns->send_face (atoi (buf)); |
739 | } |
695 | } |
740 | |
696 | |
741 | /** |
697 | /** |
742 | * This handles the general commands from the client (ie, north, fire, cast, |
698 | * This handles the general commands from the client (ie, north, fire, cast, |
743 | * etc.) |
699 | * etc.) |
… | |
… | |
879 | |
835 | |
880 | ns->cs_version = atoi (buf); |
836 | ns->cs_version = atoi (buf); |
881 | ns->sc_version = ns->cs_version; |
837 | ns->sc_version = ns->cs_version; |
882 | |
838 | |
883 | LOG (llevDebug, "connection from client <%s>\n", buf); |
839 | LOG (llevDebug, "connection from client <%s>\n", buf); |
884 | |
|
|
885 | |
840 | |
886 | //TODO: should log here just for statistics |
841 | //TODO: should log here just for statistics |
887 | |
842 | |
888 | //if (VERSION_CS != ns->cs_version) |
843 | //if (VERSION_CS != ns->cs_version) |
889 | // unchecked; |
844 | // unchecked; |
… | |
… | |
1115 | |
1070 | |
1116 | pl->ns->last_weight = weight; |
1071 | pl->ns->last_weight = weight; |
1117 | pl->ns->send_packet (sl); |
1072 | pl->ns->send_packet (sl); |
1118 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1073 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1119 | } |
1074 | } |
1120 | |
|
|
1121 | /** |
|
|
1122 | * Need to send an animation sequence to the client. |
|
|
1123 | * We will send appropriate face commands to the client if we haven't |
|
|
1124 | * sent them the face yet (this can become quite costly in terms of |
|
|
1125 | * how much we are sending - on the other hand, this should only happen |
|
|
1126 | * when the player logs in and picks stuff up. |
|
|
1127 | */ |
|
|
1128 | void |
|
|
1129 | esrv_send_animation (client * ns, short anim_num) |
|
|
1130 | { |
|
|
1131 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1132 | * are added in contigous order, so if the number is in the valid |
|
|
1133 | * range, it must be a valid animation. |
|
|
1134 | */ |
|
|
1135 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1136 | { |
|
|
1137 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1138 | return; |
|
|
1139 | } |
|
|
1140 | |
|
|
1141 | packet sl ("anim"); |
|
|
1142 | |
|
|
1143 | sl << uint16 (anim_num) |
|
|
1144 | << uint16 (0); /* flags - not used right now */ |
|
|
1145 | |
|
|
1146 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1147 | * the face itself) down to the client. |
|
|
1148 | */ |
|
|
1149 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1150 | { |
|
|
1151 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1152 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1153 | |
|
|
1154 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1155 | } |
|
|
1156 | |
|
|
1157 | ns->send_packet (sl); |
|
|
1158 | |
|
|
1159 | ns->anims_sent[anim_num] = 1; |
|
|
1160 | } |
|
|
1161 | |
|
|
1162 | |
1075 | |
1163 | /****************************************************************************** |
1076 | /****************************************************************************** |
1164 | * |
1077 | * |
1165 | * Start of map related commands. |
1078 | * Start of map related commands. |
1166 | * |
1079 | * |
… | |
… | |
1226 | * if it has changed since we last sent it to the client. |
1139 | * if it has changed since we last sent it to the client. |
1227 | */ |
1140 | */ |
1228 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1141 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1229 | { |
1142 | { |
1230 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1143 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
|
|
1144 | |
1231 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1145 | if (!ns.faces_sent[face_num]) |
|
|
1146 | if (ob) |
|
|
1147 | ns.send_faces (ob); |
|
|
1148 | else |
1232 | esrv_send_face (&ns, face_num, 0); |
1149 | ns.send_face (face_num); |
1233 | |
1150 | |
1234 | sl << uint16 (face_num); |
1151 | sl << uint16 (face_num); |
1235 | return 1; |
1152 | return 1; |
1236 | } |
1153 | } |
1237 | |
1154 | |
… | |
… | |
1255 | * holds the old values. |
1172 | * holds the old values. |
1256 | * layer is the layer to update, with 2 being the floor and 0 the |
1173 | * layer is the layer to update, with 2 being the floor and 0 the |
1257 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1174 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1258 | * take. |
1175 | * take. |
1259 | */ |
1176 | */ |
1260 | |
|
|
1261 | static inline int |
1177 | static inline int |
1262 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1178 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1263 | { |
1179 | { |
1264 | object *ob; |
|
|
1265 | int smoothlevel; /* old face_num; */ |
|
|
1266 | |
|
|
1267 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1180 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1268 | |
1181 | |
1269 | /* If there is no object for this space, or if the face for the object |
1182 | /* If there is no object for this space, or if the face for the object |
1270 | * is the blank face, set the smoothlevel to zero. |
1183 | * is the blank face, set the smoothlevel to zero. |
1271 | */ |
1184 | */ |
1272 | if (!ob || ob->face == blank_face) |
1185 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
1273 | smoothlevel = 0; |
|
|
1274 | else |
|
|
1275 | { |
|
|
1276 | smoothlevel = ob->smoothlevel; |
|
|
1277 | if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH)) |
|
|
1278 | SendSmooth (&ns, ob->face); |
|
|
1279 | } /* else not already head object or blank face */ |
|
|
1280 | |
1186 | |
1281 | /* We've gotten what face we want to use for the object. Now see if |
1187 | /* We've gotten what face we want to use for the object. Now see if |
1282 | * if it has changed since we last sent it to the client. |
1188 | * if it has changed since we last sent it to the client. |
1283 | */ |
1189 | */ |
1284 | if (smoothlevel > 255) |
1190 | if (smoothlevel > 255) |
… | |
… | |
1361 | * look like. |
1267 | * look like. |
1362 | */ |
1268 | */ |
1363 | void |
1269 | void |
1364 | draw_client_map1 (object *pl) |
1270 | draw_client_map1 (object *pl) |
1365 | { |
1271 | { |
1366 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1272 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1367 | sint16 nx, ny; |
1273 | sint16 nx, ny; |
1368 | int estartlen, eoldlen; |
1274 | int estartlen, eoldlen; |
1369 | uint16 mask, emask; |
|
|
1370 | uint8 eentrysize; |
1275 | uint8 eentrysize; |
1371 | uint16 ewhatstart, ewhatflag; |
1276 | uint16 ewhatstart, ewhatflag; |
1372 | uint8 extendedinfos; |
1277 | uint8 extendedinfos; |
1373 | maptile *m; |
1278 | maptile *m; |
1374 | |
1279 | |
… | |
… | |
1420 | * but that started to get a bit messy to look at. |
1325 | * but that started to get a bit messy to look at. |
1421 | */ |
1326 | */ |
1422 | max_x = pl->x + (socket.mapx + 1) / 2; |
1327 | max_x = pl->x + (socket.mapx + 1) / 2; |
1423 | max_y = pl->y + (socket.mapy + 1) / 2; |
1328 | max_y = pl->y + (socket.mapy + 1) / 2; |
1424 | |
1329 | |
1425 | if (socket.mapmode == Map1aCmd) |
|
|
1426 | { |
|
|
1427 | max_x += MAX_HEAD_OFFSET; |
|
|
1428 | max_y += MAX_HEAD_OFFSET; |
|
|
1429 | } |
|
|
1430 | |
|
|
1431 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1330 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1432 | { |
1331 | { |
1433 | ax = 0; |
1332 | ax = 0; |
1434 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1333 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1435 | { |
1334 | { |
|
|
1335 | int emask, mask; |
1436 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1336 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1437 | |
1337 | |
1438 | /* If this space is out of the normal viewable area, we only check |
|
|
1439 | * the heads value ax or ay will only be greater than what |
|
|
1440 | * the client wants if using the map1a command - this is because |
|
|
1441 | * if the map1a command is not used, max_x and max_y will be |
|
|
1442 | * set to lower values. |
|
|
1443 | */ |
|
|
1444 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1445 | { |
|
|
1446 | int i, got_one; |
|
|
1447 | |
|
|
1448 | oldlen = sl.length (); |
|
|
1449 | |
|
|
1450 | sl << uint16 (mask); |
|
|
1451 | |
|
|
1452 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1453 | * actually need to send that - just the coordinates |
|
|
1454 | * with no faces tells the client to blank out the |
|
|
1455 | * space. |
|
|
1456 | */ |
|
|
1457 | got_one = 0; |
|
|
1458 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1459 | if (sl[i]) |
|
|
1460 | got_one = 1; |
|
|
1461 | |
|
|
1462 | if (got_one && (mask & 0xf)) |
|
|
1463 | sl[oldlen + 1] = mask & 0xff; |
|
|
1464 | else |
|
|
1465 | { /*either all faces blank, either no face at all */ |
|
|
1466 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1467 | sl.reset (oldlen + 2); |
|
|
1468 | else |
|
|
1469 | sl.reset (oldlen); |
|
|
1470 | } |
|
|
1471 | |
|
|
1472 | /*What concerns extendinfos, nothing to be done for now |
|
|
1473 | * (perhaps effects layer later) |
|
|
1474 | */ |
|
|
1475 | continue; /* don't do processing below */ |
|
|
1476 | } |
|
|
1477 | |
|
|
1478 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1338 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1479 | |
|
|
1480 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1481 | |
1339 | |
1482 | /* If the coordinates are not valid, or it is too dark to see, |
1340 | /* If the coordinates are not valid, or it is too dark to see, |
1483 | * we tell the client as such |
1341 | * we tell the client as such |
1484 | */ |
1342 | */ |
1485 | nx = x; |
1343 | nx = x; |
… | |
… | |
1495 | if (lastcell.count != -1) |
1353 | if (lastcell.count != -1) |
1496 | { |
1354 | { |
1497 | sl << uint16 (mask); |
1355 | sl << uint16 (mask); |
1498 | map_clearcell (&lastcell, -1); |
1356 | map_clearcell (&lastcell, -1); |
1499 | } |
1357 | } |
|
|
1358 | |
|
|
1359 | continue; |
1500 | } |
1360 | } |
|
|
1361 | |
|
|
1362 | m->touch (); |
|
|
1363 | |
|
|
1364 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1365 | |
1501 | else if (d > 3) |
1366 | if (d > 3) |
1502 | { |
1367 | { |
1503 | m->touch (); |
|
|
1504 | |
1368 | |
1505 | int need_send = 0, count; |
1369 | int need_send = 0, count; |
1506 | |
1370 | |
1507 | /* This block deals with spaces that are not visible for whatever |
1371 | /* This block deals with spaces that are not visible for whatever |
1508 | * reason. Still may need to send the head for this space. |
1372 | * reason. Still may need to send the head for this space. |
1509 | */ |
1373 | */ |
1510 | |
1374 | |
1511 | oldlen = sl.length (); |
1375 | oldlen = sl.length (); |
1512 | |
1376 | |
1513 | sl << uint16 (mask); |
1377 | sl << uint16 (mask); |
… | |
… | |
1516 | need_send = 1; |
1380 | need_send = 1; |
1517 | |
1381 | |
1518 | count = -1; |
1382 | count = -1; |
1519 | |
1383 | |
1520 | /* properly clear a previously sent big face */ |
1384 | /* properly clear a previously sent big face */ |
1521 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1385 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1522 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1386 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1523 | need_send = 1; |
1387 | need_send = 1; |
1524 | |
1388 | |
1525 | map_clearcell (&lastcell, count); |
1389 | map_clearcell (&lastcell, count); |
1526 | |
1390 | |
… | |
… | |
1529 | else |
1393 | else |
1530 | sl.reset (oldlen); |
1394 | sl.reset (oldlen); |
1531 | } |
1395 | } |
1532 | else |
1396 | else |
1533 | { |
1397 | { |
1534 | m->touch (); |
|
|
1535 | |
|
|
1536 | /* In this block, the space is visible or there are head objects |
1398 | /* In this block, the space is visible. |
1537 | * we need to send. |
|
|
1538 | */ |
1399 | */ |
1539 | |
1400 | |
1540 | /* Rather than try to figure out what everything that we might |
1401 | /* Rather than try to figure out what everything that we might |
1541 | * need to send is, then form the packet after that, |
1402 | * need to send is, then form the packet after that, |
1542 | * we presume that we will in fact form a packet, and update |
1403 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1545 | * is done. |
1406 | * is done. |
1546 | * I think this is simpler than doing a bunch of checks to see |
1407 | * I think this is simpler than doing a bunch of checks to see |
1547 | * what if anything we need to send, setting the bits, then |
1408 | * what if anything we need to send, setting the bits, then |
1548 | * doing those checks again to add the real data. |
1409 | * doing those checks again to add the real data. |
1549 | */ |
1410 | */ |
1550 | oldlen = sl.length (); |
1411 | oldlen = sl.length (); |
1551 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1552 | eoldlen = esl.length (); |
1412 | eoldlen = esl.length (); |
1553 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1413 | |
1554 | sl << uint16 (mask); |
1414 | sl << uint16 (mask); |
1555 | |
1415 | |
1556 | if (socket.ext_mapinfos) |
1416 | if (socket.ext_mapinfos) |
1557 | esl << uint16 (emask); |
1417 | esl << uint16 (emask); |
1558 | |
1418 | |
… | |
… | |
1668 | if (lastcell.faces[0] != pl->face) |
1528 | if (lastcell.faces[0] != pl->face) |
1669 | { |
1529 | { |
1670 | lastcell.faces[0] = pl->face; |
1530 | lastcell.faces[0] = pl->face; |
1671 | mask |= 0x1; |
1531 | mask |= 0x1; |
1672 | |
1532 | |
1673 | if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE)) |
1533 | socket.send_faces (pl); |
1674 | esrv_send_face (&socket, pl->face, 0); |
|
|
1675 | |
1534 | |
1676 | sl << uint16 (pl->face); |
1535 | sl << uint16 (pl->face); |
1677 | } |
1536 | } |
1678 | } |
1537 | } |
1679 | else |
1538 | else |
… | |
… | |
1711 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1570 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1712 | { |
1571 | { |
1713 | /* No map data will follow, so don't say the client |
1572 | /* No map data will follow, so don't say the client |
1714 | * it doesn't need draw! |
1573 | * it doesn't need draw! |
1715 | */ |
1574 | */ |
1716 | ewhatflag &= (~EMI_NOREDRAW); |
1575 | ewhatflag &= ~EMI_NOREDRAW; |
1717 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1576 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1718 | } |
1577 | } |
1719 | |
1578 | |
1720 | if (esl.length () > estartlen) |
1579 | if (esl.length () > estartlen) |
1721 | socket.send_packet (esl); |
1580 | socket.send_packet (esl); |