| … | |
… | |
| 1552 | } |
1552 | } |
| 1553 | |
1553 | |
| 1554 | return result; |
1554 | return result; |
| 1555 | } |
1555 | } |
| 1556 | |
1556 | |
|
|
1557 | // prefetch (and touch) all maps within a specific distancd |
|
|
1558 | static void |
|
|
1559 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1560 | { |
|
|
1561 | map->last_access = runtime; |
|
|
1562 | |
|
|
1563 | if (--distance) |
|
|
1564 | for (int dir = 4; --dir; ) |
|
|
1565 | if (const shstr &path = map->tile_path [dir]) |
|
|
1566 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1567 | prefetch_surrounding_maps (neigh, distance); |
|
|
1568 | else |
|
|
1569 | neigh = maptile::find_async (path, map); |
|
|
1570 | } |
|
|
1571 | |
|
|
1572 | // prefetch a generous area around the player |
|
|
1573 | static void |
|
|
1574 | prefetch_surrounding_maps (object *op) |
|
|
1575 | { |
|
|
1576 | prefetch_surrounding_maps (op->map, 3); |
|
|
1577 | } |
|
|
1578 | |
| 1557 | /** |
1579 | /** |
| 1558 | * This function uses the new map1 protocol command to send the map |
1580 | * This function uses the new map1 protocol command to send the map |
| 1559 | * to the client. It is necessary because the old map command supports |
1581 | * to the client. It is necessary because the old map command supports |
| 1560 | * a maximum map size of 15x15. |
1582 | * a maximum map size of 15x15. |
| 1561 | * This function is much simpler than the old one. This is because |
1583 | * This function is much simpler than the old one. This is because |
| … | |
… | |
| 1592 | |
1614 | |
| 1593 | if (!pl->active) |
1615 | if (!pl->active) |
| 1594 | return; |
1616 | return; |
| 1595 | |
1617 | |
| 1596 | check_map_change (pl->contr); |
1618 | check_map_change (pl->contr); |
|
|
1619 | prefetch_surrounding_maps (pl); |
| 1597 | |
1620 | |
| 1598 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1621 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
| 1599 | packet esl; |
1622 | packet esl; |
| 1600 | |
1623 | |
| 1601 | startlen = sl.length (); |
1624 | startlen = sl.length (); |
| … | |
… | |
| 1969 | void |
1992 | void |
| 1970 | draw_client_map (object *pl) |
1993 | draw_client_map (object *pl) |
| 1971 | { |
1994 | { |
| 1972 | int i, j; |
1995 | int i, j; |
| 1973 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1996 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
| 1974 | New_Face *face, *floor; |
1997 | facetile *face, *floor; |
| 1975 | New_Face *floor2; |
1998 | facetile *floor2; |
| 1976 | int d, mflags; |
1999 | int d, mflags; |
| 1977 | struct Map newmap; |
2000 | struct Map newmap; |
| 1978 | maptile *m, *pm; |
2001 | maptile *m, *pm; |
| 1979 | |
2002 | |
| 1980 | if (pl->type != PLAYER) |
2003 | if (pl->type != PLAYER) |
