| … | |
… | |
| 459 | char tmpbuf[20]; |
459 | char tmpbuf[20]; |
| 460 | int q = atoi (param); |
460 | int q = atoi (param); |
| 461 | |
461 | |
| 462 | if (is_valid_faceset (q)) |
462 | if (is_valid_faceset (q)) |
| 463 | ns->faceset = q; |
463 | ns->faceset = q; |
|
|
464 | |
| 464 | sprintf (tmpbuf, "%d", ns->faceset); |
465 | sprintf (tmpbuf, "%d", ns->faceset); |
| 465 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
466 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
| 466 | /* if the client is using faceset, it knows about image2 command */ |
467 | /* if the client is using faceset, it knows about image2 command */ |
| 467 | ns->image2 = 1; |
468 | ns->image2 = 1; |
| 468 | } |
469 | } |
| … | |
… | |
| 1081 | |
1082 | |
| 1082 | /** Clears a map cell */ |
1083 | /** Clears a map cell */ |
| 1083 | static void |
1084 | static void |
| 1084 | map_clearcell (struct MapCell *cell, int count) |
1085 | map_clearcell (struct MapCell *cell, int count) |
| 1085 | { |
1086 | { |
| 1086 | cell->faces[0] = 0; |
1087 | cell->faces[0] = 0; |
| 1087 | cell->faces[1] = 0; |
1088 | cell->faces[1] = 0; |
| 1088 | cell->faces[2] = 0; |
1089 | cell->faces[2] = 0; |
|
|
1090 | cell->smooth[0] = 0; |
|
|
1091 | cell->smooth[1] = 0; |
|
|
1092 | cell->smooth[2] = 0; |
| 1089 | cell->count = count; |
1093 | cell->count = count; |
| 1090 | cell->stat_hp = 0; |
1094 | cell->stat_hp = 0; |
| 1091 | cell->flags = 0; |
1095 | cell->flags = 0; |
| 1092 | cell->player = 0; |
1096 | cell->player = 0; |
| 1093 | } |
1097 | } |
| 1094 | |
1098 | |
| 1095 | #define MAX_LAYERS 3 |
1099 | #define MAX_LAYERS 3 |
| 1096 | |
1100 | |
| 1097 | /** |
1101 | /** |
| … | |
… | |
| 1100 | * it was. |
1104 | * it was. |
| 1101 | * sl is the socklist this data is going into. |
1105 | * sl is the socklist this data is going into. |
| 1102 | * ns is the socket we are working on - all the info we care |
1106 | * 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 |
1107 | * about is in this socket structure, so now need not pass the |
| 1104 | * entire player object. |
1108 | * 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 |
1109 | * 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) |
1110 | * 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 |
1111 | * take. Interesting to note that before this function, the map1 function |
| 1111 | * numbers the spaces differently - I think this was a leftover from |
1112 | * 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 |
1113 | * 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 |
1114 | * the case, it seems to make more sense to have these layer values |
| 1114 | * actually match. |
1115 | * actually match. |
| 1115 | */ |
1116 | */ |
| 1116 | static int |
1117 | static int |
| 1117 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1118 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
| 1118 | { |
1119 | { |
| 1119 | uint16 face_num; |
1120 | object *ob = ms.faces_obj [layer]; |
| 1120 | int bx, by, i; |
|
|
| 1121 | |
|
|
| 1122 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
| 1123 | |
1121 | |
| 1124 | /* If there is no object for this space, or if the face for the object |
1122 | /* 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. |
1123 | * is the blank face, set the face number to zero. |
| 1126 | * else if we have the stored head object for this space, that takes |
1124 | * else if we have the stored head object for this space, that takes |
| 1127 | * precedence over the other object for this space. |
1125 | * precedence over the other object for this space. |
| 1128 | * otherwise, we do special head processing |
1126 | * otherwise, we do special head processing |
| 1129 | */ |
1127 | */ |
| 1130 | if (!ob || ob->face == blank_face) |
1128 | 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 | |
1129 | |
| 1138 | /* We've gotten what face we want to use for the object. Now see if |
1130 | /* 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. |
1131 | * if it has changed since we last sent it to the client. |
| 1140 | */ |
1132 | */ |
| 1141 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1133 | if (lastcell.faces[layer] != face_num) |
| 1142 | { |
1134 | { |
| 1143 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1135 | lastcell.faces[layer] = face_num; |
| 1144 | |
1136 | |
| 1145 | if (!ns.faces_sent[face_num]) |
1137 | if (!ns.faces_sent[face_num]) |
| 1146 | if (ob) |
1138 | if (ob) |
| 1147 | ns.send_faces (ob); |
1139 | ns.send_faces (ob); |
| 1148 | else |
1140 | else |
| 1149 | ns.send_face (face_num); |
1141 | ns.send_face (face_num); |
| 1150 | |
1142 | |
| 1151 | sl << uint16 (face_num); |
1143 | 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 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
| 1198 | sl << uint8 (smoothlevel); |
|
|
| 1199 | return 1; |
1144 | return 1; |
| 1200 | } |
1145 | } |
| 1201 | |
1146 | |
| 1202 | /* Nothing changed */ |
1147 | /* Nothing changed */ |
| 1203 | return 0; |
1148 | return 0; |
| … | |
… | |
| 1325 | * but that started to get a bit messy to look at. |
1270 | * but that started to get a bit messy to look at. |
| 1326 | */ |
1271 | */ |
| 1327 | max_x = pl->x + (socket.mapx + 1) / 2; |
1272 | max_x = pl->x + (socket.mapx + 1) / 2; |
| 1328 | max_y = pl->y + (socket.mapy + 1) / 2; |
1273 | max_y = pl->y + (socket.mapy + 1) / 2; |
| 1329 | |
1274 | |
|
|
1275 | maptile *plmap = pl->map; |
|
|
1276 | |
| 1330 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1277 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
| 1331 | { |
1278 | { |
| 1332 | ax = 0; |
1279 | ax = 0; |
| 1333 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1280 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
| 1334 | { |
1281 | { |
| … | |
… | |
| 1340 | /* If the coordinates are not valid, or it is too dark to see, |
1287 | /* If the coordinates are not valid, or it is too dark to see, |
| 1341 | * we tell the client as such |
1288 | * we tell the client as such |
| 1342 | */ |
1289 | */ |
| 1343 | nx = x; |
1290 | nx = x; |
| 1344 | ny = y; |
1291 | ny = y; |
| 1345 | m = get_map_from_coord (pl->map, &nx, &ny); |
1292 | m = get_map_from_coord (plmap, &nx, &ny); |
| 1346 | |
1293 | |
| 1347 | if (!m) |
1294 | if (!m) |
| 1348 | { |
1295 | { |
| 1349 | /* space is out of map. Update space and clear values |
1296 | /* space is out of map. Update space and clear values |
| 1350 | * if this hasn't already been done. If the space is out |
1297 | * if this hasn't already been done. If the space is out |
| … | |
… | |
| 1411 | oldlen = sl.length (); |
1358 | oldlen = sl.length (); |
| 1412 | eoldlen = esl.length (); |
1359 | eoldlen = esl.length (); |
| 1413 | |
1360 | |
| 1414 | sl << uint16 (mask); |
1361 | sl << uint16 (mask); |
| 1415 | |
1362 | |
| 1416 | if (socket.ext_mapinfos) |
|
|
| 1417 | esl << uint16 (emask); |
|
|
| 1418 | |
|
|
| 1419 | unsigned char dummy; |
1363 | unsigned char dummy; |
| 1420 | unsigned char *last_ext = &dummy; |
1364 | unsigned char *last_ext = &dummy; |
| 1421 | |
1365 | |
| 1422 | /* Darkness changed */ |
1366 | /* Darkness changed */ |
| 1423 | if (lastcell.count != d && socket.darkness) |
1367 | if (lastcell.count != d && socket.darkness) |
| … | |
… | |
| 1434 | sl << uint8 (255 - 64 * d); |
1378 | sl << uint8 (255 - 64 * d); |
| 1435 | } |
1379 | } |
| 1436 | |
1380 | |
| 1437 | lastcell.count = d; |
1381 | lastcell.count = d; |
| 1438 | |
1382 | |
|
|
1383 | mapspace &ms = m->at (nx, ny); |
|
|
1384 | |
| 1439 | if (socket.extmap) |
1385 | if (socket.extmap) |
| 1440 | { |
1386 | { |
| 1441 | uint8 stat_hp = 0; |
1387 | uint8 stat_hp = 0; |
| 1442 | uint8 stat_width = 0; |
1388 | uint8 stat_width = 0; |
| 1443 | uint8 flags = 0; |
1389 | uint8 flags = 0; |
| 1444 | UUID player = 0; |
1390 | UUID player = 0; |
| 1445 | |
1391 | |
| 1446 | // send hp information, if applicable |
1392 | // send hp information, if applicable |
| 1447 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1393 | if (object *op = ms.faces_obj [0]) |
| 1448 | { |
1394 | { |
| 1449 | if (op->head || op->invisible) |
1395 | if (op->head || op->invisible) |
| 1450 | ; // do not show |
1396 | ; // do not show |
| 1451 | else if (op->type == PLAYER |
1397 | else if (op->type == PLAYER |
| 1452 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1398 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
| … | |
… | |
| 1506 | sl << uint8 (8) << uint8 (flags); |
1452 | sl << uint8 (8) << uint8 (flags); |
| 1507 | } |
1453 | } |
| 1508 | } |
1454 | } |
| 1509 | |
1455 | |
| 1510 | /* Floor face */ |
1456 | /* Floor face */ |
| 1511 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1457 | if (update_space (sl, socket, ms, lastcell, 2)) |
| 1512 | mask |= 0x4; |
1458 | mask |= 0x4; |
| 1513 | |
1459 | |
| 1514 | if (socket.EMI_smooth) |
|
|
| 1515 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
| 1516 | emask |= 0x4; |
|
|
| 1517 | |
|
|
| 1518 | /* Middle face */ |
1460 | /* Middle face */ |
| 1519 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1461 | if (update_space (sl, socket, ms, lastcell, 1)) |
| 1520 | mask |= 0x2; |
1462 | mask |= 0x2; |
| 1521 | |
1463 | |
| 1522 | if (socket.EMI_smooth) |
1464 | if (ms.player () == pl |
| 1523 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1465 | && (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 | { |
1466 | { |
|
|
1467 | // force player to be visible to himself if invisible |
| 1528 | if (lastcell.faces[0] != pl->face) |
1468 | if (lastcell.faces[0] != pl->face) |
| 1529 | { |
1469 | { |
| 1530 | lastcell.faces[0] = pl->face; |
1470 | lastcell.faces[0] = pl->face; |
|
|
1471 | |
| 1531 | mask |= 0x1; |
1472 | mask |= 0x1; |
|
|
1473 | sl << uint16 (pl->face); |
| 1532 | |
1474 | |
| 1533 | socket.send_faces (pl); |
1475 | socket.send_faces (pl); |
| 1534 | |
|
|
| 1535 | sl << uint16 (pl->face); |
|
|
| 1536 | } |
1476 | } |
| 1537 | } |
1477 | } |
| 1538 | else |
|
|
| 1539 | { |
|
|
| 1540 | /* Top face */ |
1478 | /* Top face */ |
| 1541 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1479 | else if (update_space (sl, socket, ms, lastcell, 0)) |
| 1542 | mask |= 0x1; |
1480 | mask |= 0x1; |
| 1543 | |
|
|
| 1544 | if (socket.EMI_smooth) |
|
|
| 1545 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
| 1546 | emask |= 0x1; |
|
|
| 1547 | } |
1481 | |
| 1548 | |
1482 | |
| 1549 | /* Check to see if we are in fact sending anything for this |
1483 | /* Check to see if we are in fact sending anything for this |
| 1550 | * space by checking the mask. If so, update the mask. |
1484 | * space by checking the mask. If so, update the mask. |
| 1551 | * if not, reset the len to that from before adding the mask |
1485 | * if not, reset the len to that from before adding the mask |
| 1552 | * value, so we don't send those bits. |
1486 | * value, so we don't send those bits. |
| … | |
… | |
| 1554 | if (mask & 0xf) |
1488 | if (mask & 0xf) |
| 1555 | sl[oldlen + 1] = mask & 0xff; |
1489 | sl[oldlen + 1] = mask & 0xff; |
| 1556 | else |
1490 | else |
| 1557 | sl.reset (oldlen); |
1491 | sl.reset (oldlen); |
| 1558 | |
1492 | |
|
|
1493 | if (socket.ext_mapinfos) |
|
|
1494 | esl << uint16 (emask); |
|
|
1495 | |
|
|
1496 | if (socket.EMI_smooth) |
|
|
1497 | { |
|
|
1498 | for (int layer = 2+1; layer--; ) |
|
|
1499 | { |
|
|
1500 | object *ob = ms.faces_obj [layer]; |
|
|
1501 | |
|
|
1502 | // If there is no object for this space, or if the face for the object |
|
|
1503 | // is the blank face, set the smoothlevel to zero. |
|
|
1504 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1505 | |
|
|
1506 | // We've gotten what face we want to use for the object. Now see if |
|
|
1507 | // if it has changed since we last sent it to the client. |
|
|
1508 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1509 | { |
|
|
1510 | lastcell.smooth[layer] = smoothlevel; |
|
|
1511 | esl << uint8 (smoothlevel); |
|
|
1512 | emask |= 1 << layer; |
|
|
1513 | } |
|
|
1514 | } |
|
|
1515 | |
| 1559 | if (emask & 0xf) |
1516 | if (emask & 0xf) |
| 1560 | esl[eoldlen + 1] = emask & 0xff; |
1517 | esl[eoldlen + 1] = emask & 0xff; |
| 1561 | else |
1518 | else |
| 1562 | esl.reset (eoldlen); |
1519 | esl.reset (eoldlen); |
|
|
1520 | } |
| 1563 | } /* else this is a viewable space */ |
1521 | } /* else this is a viewable space */ |
| 1564 | } /* for x loop */ |
1522 | } /* for x loop */ |
| 1565 | } /* for y loop */ |
1523 | } /* for y loop */ |
| 1566 | |
1524 | |
| 1567 | /* Verify that we in fact do need to send this */ |
1525 | /* Verify that we in fact do need to send this */ |
