| … | |
… | |
| 40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
| 41 | * if a face has not already been sent to the client, it is sent now. |
41 | * if a face has not already been sent to the client, it is sent now. |
| 42 | * |
42 | * |
| 43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
| 44 | * operations |
44 | * operations |
| 45 | * |
|
|
| 46 | * esrv_map_doneredraw finishes the map update, and ships across the |
|
|
| 47 | * map updates. |
|
|
| 48 | * |
45 | * |
| 49 | */ |
46 | */ |
| 50 | |
47 | |
| 51 | #include <global.h> |
48 | #include <global.h> |
| 52 | #include <sproto.h> |
49 | #include <sproto.h> |
| … | |
… | |
| 1184 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1181 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
| 1185 | set_title (pl->ob, buf); |
1182 | set_title (pl->ob, buf); |
| 1186 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1183 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
| 1187 | |
1184 | |
| 1188 | /* Only send it away if we have some actual data */ |
1185 | /* Only send it away if we have some actual data */ |
| 1189 | if (sl.len > 6) |
1186 | if (sl.length () > 6) |
| 1190 | { |
|
|
| 1191 | #ifdef ESRV_DEBUG |
|
|
| 1192 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
| 1193 | #endif |
|
|
| 1194 | Send_With_Handling (&pl->socket, &sl); |
1187 | Send_With_Handling (&pl->socket, &sl); |
| 1195 | } |
|
|
| 1196 | |
|
|
| 1197 | } |
1188 | } |
| 1198 | |
1189 | |
| 1199 | /** |
1190 | /** |
| 1200 | * Tells the client that here is a player it should start using. |
1191 | * Tells the client that here is a player it should start using. |
| 1201 | */ |
1192 | */ |
| … | |
… | |
| 1391 | } |
1382 | } |
| 1392 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1383 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
| 1393 | } |
1384 | } |
| 1394 | return cur; |
1385 | return cur; |
| 1395 | } |
1386 | } |
| 1396 | |
|
|
| 1397 | static void |
|
|
| 1398 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
| 1399 | { |
|
|
| 1400 | static long frames, bytes, tbytes, tframes; |
|
|
| 1401 | char *cur; |
|
|
| 1402 | |
|
|
| 1403 | packet sl; |
|
|
| 1404 | sl << "map "; |
|
|
| 1405 | |
|
|
| 1406 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
| 1407 | sl.len = cur - (char *) sl.buf; |
|
|
| 1408 | |
|
|
| 1409 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
| 1410 | |
|
|
| 1411 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
| 1412 | { |
|
|
| 1413 | /* All of this is just accounting stuff */ |
|
|
| 1414 | if (tframes > 100) |
|
|
| 1415 | tframes = tbytes = 0; |
|
|
| 1416 | |
|
|
| 1417 | tframes++; |
|
|
| 1418 | frames++; |
|
|
| 1419 | tbytes += sl.len; |
|
|
| 1420 | bytes += sl.len; |
|
|
| 1421 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
| 1422 | Send_With_Handling (ns, &sl); |
|
|
| 1423 | ns->sent_scroll = 0; |
|
|
| 1424 | } |
|
|
| 1425 | |
|
|
| 1426 | } |
|
|
| 1427 | |
|
|
| 1428 | |
1387 | |
| 1429 | /** Clears a map cell */ |
1388 | /** Clears a map cell */ |
| 1430 | static void |
1389 | static void |
| 1431 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1390 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
| 1432 | { |
1391 | { |
| … | |
… | |
| 1837 | |
1796 | |
| 1838 | packet sl; |
1797 | packet sl; |
| 1839 | packet esl; |
1798 | packet esl; |
| 1840 | |
1799 | |
| 1841 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1800 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
| 1842 | startlen = sl.len; |
1801 | startlen = sl.length (); |
| 1843 | |
1802 | |
| 1844 | /*Extendedmapinfo structure initialisation */ |
1803 | /*Extendedmapinfo structure initialisation */ |
| 1845 | if (socket.ext_mapinfos) |
1804 | if (socket.ext_mapinfos) |
| 1846 | { |
1805 | { |
| 1847 | extendedinfos = EMI_NOREDRAW; |
1806 | extendedinfos = EMI_NOREDRAW; |
| 1848 | |
1807 | |
| 1849 | if (socket.EMI_smooth) |
1808 | if (socket.EMI_smooth) |
| 1850 | extendedinfos |= EMI_SMOOTH; |
1809 | extendedinfos |= EMI_SMOOTH; |
| 1851 | |
1810 | |
| 1852 | ewhatstart = esl.len; |
1811 | ewhatstart = esl.length (); |
| 1853 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1812 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
| 1854 | could need to be taken away */ |
1813 | could need to be taken away */ |
| 1855 | eentrysize = getExtendedMapInfoSize (&socket); |
1814 | eentrysize = getExtendedMapInfoSize (&socket); |
| 1856 | esl << "mapextended " |
1815 | esl << "mapextended " |
| 1857 | << uint8 (extendedinfos) |
1816 | << uint8 (extendedinfos) |
| 1858 | << uint8 (eentrysize); |
1817 | << uint8 (eentrysize); |
|
|
1818 | |
| 1859 | estartlen = esl.len; |
1819 | estartlen = esl.length (); |
| 1860 | } |
1820 | } |
| 1861 | else |
1821 | else |
| 1862 | { |
1822 | { |
| 1863 | /* suppress compiler warnings */ |
1823 | /* suppress compiler warnings */ |
| 1864 | ewhatstart = 0; |
1824 | ewhatstart = 0; |
| … | |
… | |
| 1902 | */ |
1862 | */ |
| 1903 | if (ax >= socket.mapx || ay >= socket.mapy) |
1863 | if (ax >= socket.mapx || ay >= socket.mapy) |
| 1904 | { |
1864 | { |
| 1905 | int i, got_one; |
1865 | int i, got_one; |
| 1906 | |
1866 | |
| 1907 | oldlen = sl.len; |
1867 | oldlen = sl.length (); |
| 1908 | |
1868 | |
| 1909 | sl << uint16 (mask); |
1869 | sl << uint16 (mask); |
| 1910 | |
1870 | |
| 1911 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1871 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
| 1912 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1872 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
| … | |
… | |
| 1916 | * actually need to send that - just the coordinates |
1876 | * actually need to send that - just the coordinates |
| 1917 | * with no faces tells the client to blank out the |
1877 | * with no faces tells the client to blank out the |
| 1918 | * space. |
1878 | * space. |
| 1919 | */ |
1879 | */ |
| 1920 | got_one = 0; |
1880 | got_one = 0; |
| 1921 | for (i = oldlen + 2; i < sl.len; i++) |
1881 | for (i = oldlen + 2; i < sl.length (); i++) |
| 1922 | if (sl.buf[i]) |
1882 | if (sl.buf[i]) |
| 1923 | got_one = 1; |
1883 | got_one = 1; |
| 1924 | |
1884 | |
| 1925 | if (got_one && (mask & 0xf)) |
1885 | if (got_one && (mask & 0xf)) |
| 1926 | sl.buf[oldlen + 1] = mask & 0xff; |
1886 | sl.buf[oldlen + 1] = mask & 0xff; |
| 1927 | else |
1887 | else |
| 1928 | { /*either all faces blank, either no face at all */ |
1888 | { /*either all faces blank, either no face at all */ |
| 1929 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1889 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
| 1930 | sl.len = oldlen + 2; |
1890 | sl.reset (oldlen + 2); |
| 1931 | else |
1891 | else |
| 1932 | sl.len = oldlen; |
1892 | sl.reset (oldlen); |
| 1933 | } |
1893 | } |
| 1934 | |
1894 | |
| 1935 | /*What concerns extendinfos, nothing to be done for now |
1895 | /*What concerns extendinfos, nothing to be done for now |
| 1936 | * (perhaps effects layer later) |
1896 | * (perhaps effects layer later) |
| 1937 | */ |
1897 | */ |
| … | |
… | |
| 1967 | |
1927 | |
| 1968 | /* This block deals with spaces that are not visible for whatever |
1928 | /* This block deals with spaces that are not visible for whatever |
| 1969 | * reason. Still may need to send the head for this space. |
1929 | * reason. Still may need to send the head for this space. |
| 1970 | */ |
1930 | */ |
| 1971 | |
1931 | |
| 1972 | oldlen = sl.len; |
1932 | oldlen = sl.length (); |
| 1973 | |
1933 | |
| 1974 | sl << uint16 (mask); |
1934 | sl << uint16 (mask); |
| 1975 | |
1935 | |
| 1976 | if (lastcell.count != -1) |
1936 | if (lastcell.count != -1) |
| 1977 | need_send = 1; |
1937 | need_send = 1; |
| … | |
… | |
| 1999 | } |
1959 | } |
| 2000 | |
1960 | |
| 2001 | if ((mask & 0xf) || need_send) |
1961 | if ((mask & 0xf) || need_send) |
| 2002 | sl.buf[oldlen + 1] = mask & 0xff; |
1962 | sl.buf[oldlen + 1] = mask & 0xff; |
| 2003 | else |
1963 | else |
| 2004 | sl.len = oldlen; |
1964 | sl.reset (oldlen); |
| 2005 | } |
1965 | } |
| 2006 | else |
1966 | else |
| 2007 | { |
1967 | { |
| 2008 | /* In this block, the space is visible or there are head objects |
1968 | /* In this block, the space is visible or there are head objects |
| 2009 | * we need to send. |
1969 | * we need to send. |
| … | |
… | |
| 2011 | |
1971 | |
| 2012 | /* Rather than try to figure out what everything that we might |
1972 | /* Rather than try to figure out what everything that we might |
| 2013 | * need to send is, then form the packet after that, |
1973 | * need to send is, then form the packet after that, |
| 2014 | * we presume that we will in fact form a packet, and update |
1974 | * we presume that we will in fact form a packet, and update |
| 2015 | * the bits by what we do actually send. If we send nothing, |
1975 | * the bits by what we do actually send. If we send nothing, |
| 2016 | * we just back out sl.len to the old value, and no harm |
1976 | * we just back out sl.length () to the old value, and no harm |
| 2017 | * is done. |
1977 | * is done. |
| 2018 | * I think this is simpler than doing a bunch of checks to see |
1978 | * I think this is simpler than doing a bunch of checks to see |
| 2019 | * what if anything we need to send, setting the bits, then |
1979 | * what if anything we need to send, setting the bits, then |
| 2020 | * doing those checks again to add the real data. |
1980 | * doing those checks again to add the real data. |
| 2021 | */ |
1981 | */ |
| 2022 | oldlen = sl.len; |
1982 | oldlen = sl.length (); |
| 2023 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1983 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
| 2024 | eoldlen = esl.len; |
1984 | eoldlen = esl.length (); |
| 2025 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1985 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
| 2026 | sl << uint16 (mask); |
1986 | sl << uint16 (mask); |
| 2027 | |
1987 | |
| 2028 | if (socket.ext_mapinfos) |
1988 | if (socket.ext_mapinfos) |
| 2029 | esl << uint16 (emask); |
1989 | esl << uint16 (emask); |
| … | |
… | |
| 2037 | mask |= 0x8; |
1997 | mask |= 0x8; |
| 2038 | |
1998 | |
| 2039 | if (socket.extmap) |
1999 | if (socket.extmap) |
| 2040 | { |
2000 | { |
| 2041 | *last_ext |= 0x80; |
2001 | *last_ext |= 0x80; |
| 2042 | last_ext = sl.buf + sl.len; |
2002 | last_ext = sl.buf + sl.length (); |
| 2043 | sl << uint8 (d); |
2003 | sl << uint8 (d); |
| 2044 | } |
2004 | } |
| 2045 | else |
2005 | else |
| 2046 | sl << uint8 (255 - 64 * d); |
2006 | sl << uint8 (255 - 64 * d); |
| 2047 | } |
2007 | } |
| … | |
… | |
| 2081 | { |
2041 | { |
| 2082 | lastcell.stat_hp = stat_hp; |
2042 | lastcell.stat_hp = stat_hp; |
| 2083 | |
2043 | |
| 2084 | mask |= 0x8; |
2044 | mask |= 0x8; |
| 2085 | *last_ext |= 0x80; |
2045 | *last_ext |= 0x80; |
| 2086 | last_ext = sl.buf + sl.len; |
2046 | last_ext = sl.buf + sl.length (); |
| 2087 | |
2047 | |
| 2088 | sl << uint8 (5) << uint8 (stat_hp); |
2048 | sl << uint8 (5) << uint8 (stat_hp); |
| 2089 | |
2049 | |
| 2090 | if (stat_width > 1) |
2050 | if (stat_width > 1) |
| 2091 | { |
2051 | { |
| 2092 | *last_ext |= 0x80; |
2052 | *last_ext |= 0x80; |
| 2093 | last_ext = sl.buf + sl.len; |
2053 | last_ext = sl.buf + sl.length (); |
| 2094 | |
2054 | |
| 2095 | sl << uint8 (6) << uint8 (stat_width); |
2055 | sl << uint8 (6) << uint8 (stat_width); |
| 2096 | } |
2056 | } |
| 2097 | } |
2057 | } |
| 2098 | |
2058 | |
| … | |
… | |
| 2100 | { |
2060 | { |
| 2101 | lastcell.player = player; |
2061 | lastcell.player = player; |
| 2102 | |
2062 | |
| 2103 | mask |= 0x8; |
2063 | mask |= 0x8; |
| 2104 | *last_ext |= 0x80; |
2064 | *last_ext |= 0x80; |
| 2105 | last_ext = sl.buf + sl.len; |
2065 | last_ext = sl.buf + sl.length (); |
| 2106 | |
2066 | |
| 2107 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2067 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
| 2108 | } |
2068 | } |
| 2109 | |
2069 | |
| 2110 | if (lastcell.flags != flags) |
2070 | if (lastcell.flags != flags) |
| 2111 | { |
2071 | { |
| 2112 | lastcell.flags = flags; |
2072 | lastcell.flags = flags; |
| 2113 | |
2073 | |
| 2114 | mask |= 0x8; |
2074 | mask |= 0x8; |
| 2115 | *last_ext |= 0x80; |
2075 | *last_ext |= 0x80; |
| 2116 | last_ext = sl.buf + sl.len; |
2076 | last_ext = sl.buf + sl.length (); |
| 2117 | |
2077 | |
| 2118 | sl << uint8 (8) << uint8 (flags); |
2078 | sl << uint8 (8) << uint8 (flags); |
| 2119 | } |
2079 | } |
| 2120 | } |
2080 | } |
| 2121 | |
2081 | |
| … | |
… | |
| 2165 | * value, so we don't send those bits. |
2125 | * value, so we don't send those bits. |
| 2166 | */ |
2126 | */ |
| 2167 | if (mask & 0xf) |
2127 | if (mask & 0xf) |
| 2168 | sl.buf[oldlen + 1] = mask & 0xff; |
2128 | sl.buf[oldlen + 1] = mask & 0xff; |
| 2169 | else |
2129 | else |
| 2170 | sl.len = oldlen; |
2130 | sl.reset (oldlen); |
| 2171 | |
2131 | |
| 2172 | if (emask & 0xf) |
2132 | if (emask & 0xf) |
| 2173 | esl.buf[eoldlen + 1] = emask & 0xff; |
2133 | esl.buf[eoldlen + 1] = emask & 0xff; |
| 2174 | else |
2134 | else |
| 2175 | esl.len = eoldlen; |
2135 | esl.reset (eoldlen); |
| 2176 | } /* else this is a viewable space */ |
2136 | } /* else this is a viewable space */ |
| 2177 | } /* for x loop */ |
2137 | } /* for x loop */ |
| 2178 | } /* for y loop */ |
2138 | } /* for y loop */ |
| 2179 | |
2139 | |
| 2180 | /* Verify that we in fact do need to send this */ |
2140 | /* Verify that we in fact do need to send this */ |
| 2181 | if (socket.ext_mapinfos) |
2141 | if (socket.ext_mapinfos) |
| 2182 | { |
2142 | { |
| 2183 | if (!(sl.len > startlen || socket.sent_scroll)) |
2143 | if (!(sl.length () > startlen || socket.sent_scroll)) |
| 2184 | { |
2144 | { |
| 2185 | /* No map data will follow, so don't say the client |
2145 | /* No map data will follow, so don't say the client |
| 2186 | * it doesn't need draw! |
2146 | * it doesn't need draw! |
| 2187 | */ |
2147 | */ |
| 2188 | ewhatflag &= (~EMI_NOREDRAW); |
2148 | ewhatflag &= (~EMI_NOREDRAW); |
| 2189 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2149 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
| 2190 | } |
2150 | } |
| 2191 | |
2151 | |
| 2192 | if (esl.len > estartlen) |
2152 | if (esl.length () > estartlen) |
| 2193 | Send_With_Handling (&socket, &esl); |
2153 | Send_With_Handling (&socket, &esl); |
| 2194 | } |
2154 | } |
| 2195 | |
2155 | |
| 2196 | if (sl.len > startlen || socket.sent_scroll) |
2156 | if (sl.length () > startlen || socket.sent_scroll) |
| 2197 | { |
2157 | { |
| 2198 | Send_With_Handling (&socket, &sl); |
2158 | Send_With_Handling (&socket, &sl); |
| 2199 | socket.sent_scroll = 0; |
2159 | socket.sent_scroll = 0; |
| 2200 | } |
2160 | } |
| 2201 | } |
2161 | } |
| … | |
… | |
| 2256 | { |
2216 | { |
| 2257 | update_los (pl); |
2217 | update_los (pl); |
| 2258 | pl->contr->do_los = 0; |
2218 | pl->contr->do_los = 0; |
| 2259 | } |
2219 | } |
| 2260 | |
2220 | |
| 2261 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
| 2262 | { |
|
|
| 2263 | /* Big maps need a different drawing mechanism to work */ |
2221 | /* Big maps need a different drawing mechanism to work */ |
| 2264 | draw_client_map1 (pl); |
2222 | draw_client_map1 (pl); |
| 2265 | return; |
|
|
| 2266 | } |
|
|
| 2267 | |
|
|
| 2268 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
| 2269 | { |
|
|
| 2270 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
| 2271 | } |
|
|
| 2272 | |
|
|
| 2273 | /* j and i are the y and x coordinates of the real map (which is |
|
|
| 2274 | * basically some number of spaces around the player) |
|
|
| 2275 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
| 2276 | * left corner) and are thus disconnected from the map values. |
|
|
| 2277 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
| 2278 | * player has specified an even map. Otherwise, we try to send them too |
|
|
| 2279 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
| 2280 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
| 2281 | * odd, this still works fine. |
|
|
| 2282 | */ |
|
|
| 2283 | ay = 0; |
|
|
| 2284 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
| 2285 | { |
|
|
| 2286 | ax = 0; |
|
|
| 2287 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
| 2288 | { |
|
|
| 2289 | |
|
|
| 2290 | d = pl->contr->blocked_los[ax][ay]; |
|
|
| 2291 | /* note the out_of_map and d>3 checks are both within the same |
|
|
| 2292 | * negation check. |
|
|
| 2293 | */ |
|
|
| 2294 | nx = i; |
|
|
| 2295 | ny = j; |
|
|
| 2296 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
| 2297 | if (m && d < 4) |
|
|
| 2298 | { |
|
|
| 2299 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
| 2300 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
| 2301 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
| 2302 | |
|
|
| 2303 | /* If all is blank, send a blank face. */ |
|
|
| 2304 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
| 2305 | { |
|
|
| 2306 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
| 2307 | } |
|
|
| 2308 | else |
|
|
| 2309 | { /* actually have something interesting */ |
|
|
| 2310 | /* send the darkness mask, if any. */ |
|
|
| 2311 | if (d && pl->contr->socket.darkness) |
|
|
| 2312 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
| 2313 | |
|
|
| 2314 | if (face && face != blank_face) |
|
|
| 2315 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
| 2316 | if (floor2 && floor2 != blank_face) |
|
|
| 2317 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
| 2318 | if (floor && floor != blank_face) |
|
|
| 2319 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
| 2320 | } |
|
|
| 2321 | } /* Is a valid space */ |
|
|
| 2322 | } |
|
|
| 2323 | } |
|
|
| 2324 | |
|
|
| 2325 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
| 2326 | |
|
|
| 2327 | check_map_change (pl->contr); |
|
|
| 2328 | } |
2223 | } |
| 2329 | |
2224 | |
| 2330 | |
2225 | |
| 2331 | /*****************************************************************************/ |
2226 | /*****************************************************************************/ |
| 2332 | |
2227 | |
| … | |
… | |
| 2354 | sl << "replyinfo skill_info\n"; |
2249 | sl << "replyinfo skill_info\n"; |
| 2355 | |
2250 | |
| 2356 | for (int i = 1; i < NUM_SKILLS; i++) |
2251 | for (int i = 1; i < NUM_SKILLS; i++) |
| 2357 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2252 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
| 2358 | |
2253 | |
| 2359 | if (sl.len >= MAXSOCKBUF) |
2254 | if (sl.length () >= MAXSOCKBUF) |
| 2360 | { |
2255 | { |
| 2361 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2256 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
| 2362 | fatal (0); |
2257 | fatal (0); |
| 2363 | } |
2258 | } |
| 2364 | |
2259 | |
| … | |
… | |
| 2377 | sl << "replyinfo spell_paths\n"; |
2272 | sl << "replyinfo spell_paths\n"; |
| 2378 | |
2273 | |
| 2379 | for (int i = 0; i < NRSPELLPATHS; i++) |
2274 | for (int i = 0; i < NRSPELLPATHS; i++) |
| 2380 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2275 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
| 2381 | |
2276 | |
| 2382 | if (sl.len >= MAXSOCKBUF) |
2277 | if (sl.length () >= MAXSOCKBUF) |
| 2383 | { |
2278 | { |
| 2384 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2279 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
| 2385 | fatal (0); |
2280 | fatal (0); |
| 2386 | } |
2281 | } |
| 2387 | |
2282 | |
| … | |
… | |
| 2541 | * like it will fix this |
2436 | * like it will fix this |
| 2542 | */ |
2437 | */ |
| 2543 | if (spell->type != SPELL) |
2438 | if (spell->type != SPELL) |
| 2544 | continue; |
2439 | continue; |
| 2545 | |
2440 | |
| 2546 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2441 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
| 2547 | { |
2442 | { |
| 2548 | Send_With_Handling (&pl->socket, &sl); |
2443 | Send_With_Handling (&pl->socket, &sl); |
| 2549 | strcpy ((char *) sl.buf, "addspell "); |
2444 | |
| 2550 | sl.len = strlen ((char *) sl.buf); |
2445 | sl.reset (); |
|
|
2446 | sl << "addspell "; |
| 2551 | } |
2447 | } |
| 2552 | |
2448 | |
| 2553 | append_spell (pl, sl, spell); |
2449 | append_spell (pl, sl, spell); |
| 2554 | } |
2450 | } |
| 2555 | } |
2451 | } |
