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.69 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.70 by root, Sun Mar 11 21:26:05 2007 UTC

… …
1166 * 1166 *
1167 ******************************************************************************/ 1167 ******************************************************************************/
1168 1168
1169/** Clears a map cell */ 1169/** Clears a map cell */
1170static void 1170static void
1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int count)
1172{ 1172{
1173 cell->faces[0] = face0; 1173 cell->faces[0] = 0;
1174 cell->faces[1] = face1; 1174 cell->faces[1] = 0;
1175 cell->faces[2] = face2; 1175 cell->faces[2] = 0;
1176 cell->count = count; 1176 cell->count = count;
1177 cell->stat_hp = 0; 1177 cell->stat_hp = 0;
1178 cell->flags = 0; 1178 cell->flags = 0;
1179 cell->player = 0; 1179 cell->player = 0;
1180} 1180}
1181 1181
1182#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1183#define MAX_LAYERS 3 1182#define MAX_LAYERS 3
1184
1185/* Using a global really isn't a good approach, but saves the over head of
1186 * allocating and deallocating such a block of data each time run through,
1187 * and saves the space of allocating this in the socket object when we only
1188 * need it for this cycle. If the server is ever threaded, this needs to be
1189 * re-examined.
1190 */
1191static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1192
1193/**
1194 * Returns true if any of the heads for this
1195 * space is set. Returns false if all are blank - this is used
1196 * for empty space checking.
1197 */
1198static inline int
1199have_head (int ax, int ay)
1200{
1201 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1202 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1203 return 1;
1204
1205 return 0;
1206}
1207
1208/**
1209 * check_head is a bit simplistic version of update_space below.
1210 * basically, it only checks the that the head on space ax,ay at layer
1211 * needs to get sent - if so, it adds the data, sending the head
1212 * if needed, and returning 1. If this no data needs to get
1213 * sent, it returns zero.
1214 */
1215static int
1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1217{
1218 short face_num;
1219
1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face;
1222 else
1223 face_num = 0;
1224
1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1226 {
1227 sl << uint16 (face_num);
1228 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1229 esrv_send_face (&ns, face_num, 0);
1230
1231 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1232 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1233 return 1;
1234 }
1235
1236 return 0; /* No change */
1237}
1238 1183
1239/** 1184/**
1240 * Removes the need to replicate the same code for each layer. 1185 * Removes the need to replicate the same code for each layer.
1241 * this returns true if this space is now in fact different than 1186 * this returns true if this space is now in fact different than
1242 * it was. 1187 * it was.
… …
1256 * actually match. 1201 * actually match.
1257 */ 1202 */
1258static int 1203static int
1259update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1260{ 1205{
1261 object *ob, *head;
1262 uint16 face_num; 1206 uint16 face_num;
1263 int bx, by, i; 1207 int bx, by, i;
1264 1208
1265 /* If there is a multipart object stored away, treat that as more important.
1266 * If not, then do the normal processing.
1267 */
1268 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1269
1270 /* Check to see if this head is part of the set of objects
1271 * we would normally send for this space. If so, then
1272 * don't use the head value. We need to do the check
1273 * here and not when setting up the heads[] value for two reasons -
1274 * 1) the heads[] values will get used even if the space is not visible.
1275 * 2) its possible the head is not on the same map as a part, and I'd
1276 * rather not need to do the map translation overhead.
1277 * 3) We need to do some extra checking to make sure that we will
1278 * otherwise send the image as this layer, eg, either it matches
1279 * the head value, or is not multipart.
1280 */
1281 if (head && !head->more)
1282 {
1283 for (i = 0; i < MAP_LAYERS; i++)
1284 {
1285 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1286 if (!ob)
1287 continue;
1288
1289 if (ob->head)
1290 ob = ob->head;
1291
1292 if (ob == head)
1293 {
1294 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1295 head = NULL;
1296 break;
1297 }
1298 }
1299 }
1300
1301 ob = head;
1302 if (!ob)
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1304 1210
1305 /* If there is no object for this space, or if the face for the object 1211 /* If there is no object for this space, or if the face for the object
1306 * is the blank face, set the face number to zero. 1212 * is the blank face, set the face number to zero.
1307 * else if we have the stored head object for this space, that takes 1213 * else if we have the stored head object for this space, that takes
1308 * precedence over the other object for this space. 1214 * precedence over the other object for this space.
1309 * otherwise, we do special head processing 1215 * otherwise, we do special head processing
1310 */ 1216 */
1311 if (!ob || ob->face == blank_face) 1217 if (!ob || ob->face == blank_face)
1312 face_num = 0; 1218 face_num = 0;
1313 else if (head)
1314 {
1315 /* if this is a head that had previously been stored */
1316 face_num = ob->face;
1317 }
1318 else 1219 else
1319 {
1320 /* if the faces for the different parts of a multipart object
1321 * are the same, we only want to send the bottom right most
1322 * portion of the object. That info is in the tail_.. values
1323 * of the head. Note that for the head itself, ob->head will
1324 * be null, so we only do this block if we are working on
1325 * a tail piece.
1326 */
1327
1328 /* tail_x and tail_y will only be set in the head object. If
1329 * this is the head object and these are set, we proceed
1330 * with logic to only send bottom right. Similarly, if
1331 * this is one of the more parts but the head has those values
1332 * set, we want to do the processing. There can be cases where
1333 * the head is not visible but one of its parts is, so we just
1334 * can always expect that ob->arch->tail_x will be true for all
1335 * object we may want to display.
1336 */
1337 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1338 {
1339
1340 if (ob->head)
1341 head = ob->head;
1342 else
1343 head = ob;
1344
1345 /* Basically figure out where the offset is from where we are right
1346 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1347 * piece is from the head, and the tail is where the tail is from the
1348 * head. Note that bx and by will equal sx and sy if we are already working
1349 * on the bottom right corner. If ob is the head, the clone values
1350 * will be zero, so the right thing will still happen.
1351 */
1352 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1353 by = sy + head->arch->tail_y - ob->arch->clone.y;
1354
1355 /* I don't think this can ever happen, but better to check for it just
1356 * in case.
1357 */
1358 if (bx < sx || by < sy)
1359 {
1360 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1361 face_num = 0;
1362 }
1363 /* single part object, multipart object with non merged faces,
1364 * of multipart object already at lower right.
1365 */
1366 else if (bx == sx && by == sy)
1367 {
1368 face_num = ob->face;
1369
1370 /* if this face matches one stored away, clear that one away.
1371 * this code relies on the fact that the map1 commands
1372 * goes from 2 down to 0.
1373 */
1374 for (i = 0; i < MAP_LAYERS; i++)
1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face == face_num)
1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1378 }
1379 else
1380 {
1381 /* If this head is stored away, clear it - otherwise,
1382 * there can be cases where a object is on multiple layers -
1383 * we only want to send it once.
1384 */
1385 face_num = head->face;
1386 for (i = 0; i < MAP_LAYERS; i++)
1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face == face_num)
1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1390
1391 /* First, try to put the new head on the same layer. If that is used up,
1392 * then find another layer.
1393 */
1394 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1395 {
1396 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1397 }
1398 else
1399 for (i = 0; i < MAX_LAYERS; i++)
1400 {
1401 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1402 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1403 {
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1405 }
1406 }
1407 face_num = 0; /* Don't send this object - we'll send the head later */
1408 }
1409 }
1410 else
1411 {
1412 /* In this case, we are already at the lower right or single part object, 1220 /* In this case, we are already at the lower right or single part object,
1413 * so nothing special 1221 * so nothing special
1414 */ 1222 */
1415 face_num = ob->face; 1223 face_num = ob->face;
1416
1417 /* clear out any head entries that have the same face as this one */
1418 for (bx = 0; bx < layer; bx++)
1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face == face_num)
1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1422 }
1423 } /* else not already head object or blank face */
1424
1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
1426 * but there is a head on the next layer, send that instead.
1427 * Without this, what happens is you can get the case where the player stands
1428 * on the same space as the head. However, if you have overlapping big objects
1429 * of the same type, what happens then is it doesn't think it needs to send
1430 * This tends to make stacking also work/look better.
1431 */
1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1433 {
1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face;
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1436 }
1437
1438 /* Another hack - because of heads and whatnot, this face may match one
1439 * we already sent for a lower layer. In that case, don't send
1440 * this one.
1441 */
1442 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1443 face_num = 0;
1444 1224
1445 /* We've gotten what face we want to use for the object. Now see if 1225 /* We've gotten what face we want to use for the object. Now see if
1446 * if it has changed since we last sent it to the client. 1226 * if it has changed since we last sent it to the client.
1447 */ 1227 */
1448 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1629 ewhatstart = 0; 1409 ewhatstart = 0;
1630 ewhatflag = 0; 1410 ewhatflag = 0;
1631 estartlen = 0; 1411 estartlen = 0;
1632 } 1412 }
1633 1413
1634 /* Init data to zero */
1635 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1636
1637 /* x,y are the real map locations. ax, ay are viewport relative 1414 /* x,y are the real map locations. ax, ay are viewport relative
1638 * locations. 1415 * locations.
1639 */ 1416 */
1640 ay = 0; 1417 ay = 0;
1641 1418
… …
1670 1447
1671 oldlen = sl.length (); 1448 oldlen = sl.length ();
1672 1449
1673 sl << uint16 (mask); 1450 sl << uint16 (mask);
1674 1451
1675 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1676 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1677 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1678
1679 /* If all we are doing is sending 0 (blank) faces, we don't 1452 /* If all we are doing is sending 0 (blank) faces, we don't
1680 * actually need to send that - just the coordinates 1453 * actually need to send that - just the coordinates
1681 * with no faces tells the client to blank out the 1454 * with no faces tells the client to blank out the
1682 * space. 1455 * space.
1683 */ 1456 */
… …
1720 * of the map, it shouldn't have a head 1493 * of the map, it shouldn't have a head
1721 */ 1494 */
1722 if (lastcell.count != -1) 1495 if (lastcell.count != -1)
1723 { 1496 {
1724 sl << uint16 (mask); 1497 sl << uint16 (mask);
1725 map_clearcell (&lastcell, 0, 0, 0, -1); 1498 map_clearcell (&lastcell, -1);
1726 } 1499 }
1727 } 1500 }
1728 else if (d > 3) 1501 else if (d > 3)
1729 { 1502 {
1730 m->touch (); 1503 m->touch ();
… …
1742 if (lastcell.count != -1) 1515 if (lastcell.count != -1)
1743 need_send = 1; 1516 need_send = 1;
1744 1517
1745 count = -1; 1518 count = -1;
1746 1519
1747 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1748 {
1749 /* Now check to see if any heads need to be sent */
1750
1751 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1752 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1753 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1754
1755 lastcell.count = count;
1756 }
1757 else
1758 {
1759 /* properly clear a previously sent big face */ 1520 /* properly clear a previously sent big face */
1760 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1761 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1522 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1762 need_send = 1; 1523 need_send = 1;
1763 1524
1764 map_clearcell (&lastcell, 0, 0, 0, count); 1525 map_clearcell (&lastcell, count);
1765 }
1766 1526
1767 if ((mask & 0xf) || need_send) 1527 if ((mask & 0xf) || need_send)
1768 sl[oldlen + 1] = mask & 0xff; 1528 sl[oldlen + 1] = mask & 0xff;
1769 else 1529 else
1770 sl.reset (oldlen); 1530 sl.reset (oldlen);

Diff Legend

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