… | |
… | |
689 | * to smooth a picture number given as argument. |
689 | * to smooth a picture number given as argument. |
690 | */ |
690 | */ |
691 | void |
691 | void |
692 | AskSmooth (char *buf, int len, client *ns) |
692 | AskSmooth (char *buf, int len, client *ns) |
693 | { |
693 | { |
694 | ns->send_smooth (atoi (buf)); |
694 | ns->send_face (atoi (buf)); |
695 | } |
695 | } |
696 | |
696 | |
697 | /** |
697 | /** |
698 | * 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, |
699 | * etc.) |
699 | * etc.) |
… | |
… | |
1081 | |
1081 | |
1082 | /** Clears a map cell */ |
1082 | /** Clears a map cell */ |
1083 | static void |
1083 | static void |
1084 | map_clearcell (struct MapCell *cell, int count) |
1084 | map_clearcell (struct MapCell *cell, int count) |
1085 | { |
1085 | { |
1086 | cell->faces[0] = 0; |
1086 | cell->faces[0] = 0; |
1087 | cell->faces[1] = 0; |
1087 | cell->faces[1] = 0; |
1088 | cell->faces[2] = 0; |
1088 | cell->faces[2] = 0; |
|
|
1089 | cell->smooth[0] = 0; |
|
|
1090 | cell->smooth[1] = 0; |
|
|
1091 | cell->smooth[2] = 0; |
1089 | cell->count = count; |
1092 | cell->count = count; |
1090 | cell->stat_hp = 0; |
1093 | cell->stat_hp = 0; |
1091 | cell->flags = 0; |
1094 | cell->flags = 0; |
1092 | cell->player = 0; |
1095 | cell->player = 0; |
1093 | } |
1096 | } |
1094 | |
1097 | |
1095 | #define MAX_LAYERS 3 |
1098 | #define MAX_LAYERS 3 |
1096 | |
1099 | |
1097 | /** |
1100 | /** |
… | |
… | |
1100 | * it was. |
1103 | * it was. |
1101 | * sl is the socklist this data is going into. |
1104 | * sl is the socklist this data is going into. |
1102 | * ns is the socket we are working on - all the info we care |
1105 | * 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 |
1106 | * about is in this socket structure, so now need not pass the |
1104 | * entire player object. |
1107 | * 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 |
1108 | * 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) |
1109 | * 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 |
1110 | * take. Interesting to note that before this function, the map1 function |
1111 | * numbers the spaces differently - I think this was a leftover from |
1111 | * 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 |
1112 | * 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 |
1113 | * the case, it seems to make more sense to have these layer values |
1114 | * actually match. |
1114 | * actually match. |
1115 | */ |
1115 | */ |
1116 | static int |
1116 | static int |
1117 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1117 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1118 | { |
1118 | { |
1119 | uint16 face_num; |
1119 | object *ob = ms.faces_obj [layer]; |
1120 | int bx, by, i; |
|
|
1121 | |
|
|
1122 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1123 | |
1120 | |
1124 | /* If there is no object for this space, or if the face for the object |
1121 | /* 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. |
1122 | * is the blank face, set the face number to zero. |
1126 | * else if we have the stored head object for this space, that takes |
1123 | * else if we have the stored head object for this space, that takes |
1127 | * precedence over the other object for this space. |
1124 | * precedence over the other object for this space. |
1128 | * otherwise, we do special head processing |
1125 | * otherwise, we do special head processing |
1129 | */ |
1126 | */ |
1130 | if (!ob || ob->face == blank_face) |
1127 | 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 | |
1128 | |
1138 | /* We've gotten what face we want to use for the object. Now see if |
1129 | /* 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. |
1130 | * if it has changed since we last sent it to the client. |
1140 | */ |
1131 | */ |
1141 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1132 | if (lastcell.faces[layer] != face_num) |
1142 | { |
1133 | { |
1143 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1134 | lastcell.faces[layer] = face_num; |
1144 | |
1135 | |
1145 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1136 | if (!ns.faces_sent[face_num]) |
1146 | if (ob) |
1137 | if (ob) |
1147 | ns.send_faces (ob); |
1138 | ns.send_faces (ob); |
1148 | else |
1139 | else |
1149 | ns.send_face (face_num); |
1140 | ns.send_face (face_num); |
1150 | |
1141 | |
1151 | sl << uint16 (face_num); |
1142 | 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 | */ |
|
|
1177 | static inline int |
|
|
1178 | update_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 | if (smoothlevel) |
|
|
1198 | ns.send_smooth (ob->face); |
|
|
1199 | |
|
|
1200 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1201 | sl << uint8 (smoothlevel); |
|
|
1202 | return 1; |
1143 | return 1; |
1203 | } |
1144 | } |
1204 | |
1145 | |
1205 | /* Nothing changed */ |
1146 | /* Nothing changed */ |
1206 | return 0; |
1147 | return 0; |
… | |
… | |
1414 | oldlen = sl.length (); |
1355 | oldlen = sl.length (); |
1415 | eoldlen = esl.length (); |
1356 | eoldlen = esl.length (); |
1416 | |
1357 | |
1417 | sl << uint16 (mask); |
1358 | sl << uint16 (mask); |
1418 | |
1359 | |
1419 | if (socket.ext_mapinfos) |
|
|
1420 | esl << uint16 (emask); |
|
|
1421 | |
|
|
1422 | unsigned char dummy; |
1360 | unsigned char dummy; |
1423 | unsigned char *last_ext = &dummy; |
1361 | unsigned char *last_ext = &dummy; |
1424 | |
1362 | |
1425 | /* Darkness changed */ |
1363 | /* Darkness changed */ |
1426 | if (lastcell.count != d && socket.darkness) |
1364 | if (lastcell.count != d && socket.darkness) |
… | |
… | |
1437 | sl << uint8 (255 - 64 * d); |
1375 | sl << uint8 (255 - 64 * d); |
1438 | } |
1376 | } |
1439 | |
1377 | |
1440 | lastcell.count = d; |
1378 | lastcell.count = d; |
1441 | |
1379 | |
|
|
1380 | mapspace &ms = m->at (nx, ny); |
|
|
1381 | |
1442 | if (socket.extmap) |
1382 | if (socket.extmap) |
1443 | { |
1383 | { |
1444 | uint8 stat_hp = 0; |
1384 | uint8 stat_hp = 0; |
1445 | uint8 stat_width = 0; |
1385 | uint8 stat_width = 0; |
1446 | uint8 flags = 0; |
1386 | uint8 flags = 0; |
1447 | UUID player = 0; |
1387 | UUID player = 0; |
1448 | |
1388 | |
1449 | // send hp information, if applicable |
1389 | // send hp information, if applicable |
1450 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1390 | if (object *op = ms.faces_obj [0]) |
1451 | { |
1391 | { |
1452 | if (op->head || op->invisible) |
1392 | if (op->head || op->invisible) |
1453 | ; // do not show |
1393 | ; // do not show |
1454 | else if (op->type == PLAYER |
1394 | else if (op->type == PLAYER |
1455 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1395 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
… | |
… | |
1509 | sl << uint8 (8) << uint8 (flags); |
1449 | sl << uint8 (8) << uint8 (flags); |
1510 | } |
1450 | } |
1511 | } |
1451 | } |
1512 | |
1452 | |
1513 | /* Floor face */ |
1453 | /* Floor face */ |
1514 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1454 | if (update_space (sl, socket, ms, lastcell, 2)) |
1515 | mask |= 0x4; |
1455 | mask |= 0x4; |
1516 | |
1456 | |
1517 | if (socket.EMI_smooth) |
|
|
1518 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
1519 | emask |= 0x4; |
|
|
1520 | |
|
|
1521 | /* Middle face */ |
1457 | /* Middle face */ |
1522 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1458 | if (update_space (sl, socket, ms, lastcell, 1)) |
1523 | mask |= 0x2; |
1459 | mask |= 0x2; |
1524 | |
1460 | |
1525 | if (socket.EMI_smooth) |
1461 | if (ms.player () == pl |
1526 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1462 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
1527 | emask |= 0x2; |
|
|
1528 | |
|
|
1529 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
1530 | { |
1463 | { |
|
|
1464 | // force player to be visible to himself if invisible |
1531 | if (lastcell.faces[0] != pl->face) |
1465 | if (lastcell.faces[0] != pl->face) |
1532 | { |
1466 | { |
1533 | lastcell.faces[0] = pl->face; |
1467 | lastcell.faces[0] = pl->face; |
|
|
1468 | |
1534 | mask |= 0x1; |
1469 | mask |= 0x1; |
|
|
1470 | sl << uint16 (pl->face); |
1535 | |
1471 | |
1536 | socket.send_faces (pl); |
1472 | socket.send_faces (pl); |
1537 | |
|
|
1538 | sl << uint16 (pl->face); |
|
|
1539 | } |
1473 | } |
1540 | } |
1474 | } |
1541 | else |
|
|
1542 | { |
|
|
1543 | /* Top face */ |
1475 | /* Top face */ |
1544 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1476 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1545 | mask |= 0x1; |
1477 | mask |= 0x1; |
1546 | |
|
|
1547 | if (socket.EMI_smooth) |
|
|
1548 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
1549 | emask |= 0x1; |
|
|
1550 | } |
1478 | |
1551 | |
1479 | |
1552 | /* Check to see if we are in fact sending anything for this |
1480 | /* Check to see if we are in fact sending anything for this |
1553 | * space by checking the mask. If so, update the mask. |
1481 | * space by checking the mask. If so, update the mask. |
1554 | * if not, reset the len to that from before adding the mask |
1482 | * if not, reset the len to that from before adding the mask |
1555 | * value, so we don't send those bits. |
1483 | * value, so we don't send those bits. |
… | |
… | |
1557 | if (mask & 0xf) |
1485 | if (mask & 0xf) |
1558 | sl[oldlen + 1] = mask & 0xff; |
1486 | sl[oldlen + 1] = mask & 0xff; |
1559 | else |
1487 | else |
1560 | sl.reset (oldlen); |
1488 | sl.reset (oldlen); |
1561 | |
1489 | |
|
|
1490 | if (socket.ext_mapinfos) |
|
|
1491 | esl << uint16 (emask); |
|
|
1492 | |
|
|
1493 | if (socket.EMI_smooth) |
|
|
1494 | { |
|
|
1495 | for (int layer = 2+1; layer--; ) |
|
|
1496 | { |
|
|
1497 | object *ob = ms.faces_obj [layer]; |
|
|
1498 | |
|
|
1499 | // If there is no object for this space, or if the face for the object |
|
|
1500 | // is the blank face, set the smoothlevel to zero. |
|
|
1501 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1502 | |
|
|
1503 | // We've gotten what face we want to use for the object. Now see if |
|
|
1504 | // if it has changed since we last sent it to the client. |
|
|
1505 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1506 | { |
|
|
1507 | lastcell.smooth[layer] = smoothlevel; |
|
|
1508 | esl << uint8 (smoothlevel); |
|
|
1509 | emask |= 1 << layer; |
|
|
1510 | } |
|
|
1511 | } |
|
|
1512 | |
1562 | if (emask & 0xf) |
1513 | if (emask & 0xf) |
1563 | esl[eoldlen + 1] = emask & 0xff; |
1514 | esl[eoldlen + 1] = emask & 0xff; |
1564 | else |
1515 | else |
1565 | esl.reset (eoldlen); |
1516 | esl.reset (eoldlen); |
|
|
1517 | } |
1566 | } /* else this is a viewable space */ |
1518 | } /* else this is a viewable space */ |
1567 | } /* for x loop */ |
1519 | } /* for x loop */ |
1568 | } /* for y loop */ |
1520 | } /* for y loop */ |
1569 | |
1521 | |
1570 | /* Verify that we in fact do need to send this */ |
1522 | /* Verify that we in fact do need to send this */ |