1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel |
5 | * Copyright (©) 2001,2007 Mark Wedel |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * under the terms of the GNU General Public License as published by the Free |
9 | * it under the terms of the GNU General Public License as published by |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, but |
13 | * This program is distributed in the hope that it will be useful, |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License along |
18 | * You should have received a copy of the GNU General Public License |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /** |
24 | /** |
26 | * \file |
25 | * \file |
27 | * Client handling. |
26 | * Client handling. |
… | |
… | |
130 | } |
129 | } |
131 | |
130 | |
132 | static void |
131 | static void |
133 | clear_map (player *pl) |
132 | clear_map (player *pl) |
134 | { |
133 | { |
|
|
134 | pl->ns->mapinfo_queue_clear (); |
|
|
135 | |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | |
137 | |
137 | pl->ns->force_newmap = false; |
138 | pl->ns->force_newmap = false; |
138 | |
139 | |
139 | if (pl->ns->newmapcmd == 1) |
140 | if (pl->ns->newmapcmd == 1) |
140 | pl->ns->send_packet ("newmap"); |
141 | pl->ns->send_packet ("newmap"); |
141 | |
142 | |
142 | pl->ns->floorbox_reset (); |
143 | pl->ns->floorbox_reset (); |
|
|
144 | } |
|
|
145 | |
|
|
146 | static void |
|
|
147 | send_map_info (player *pl) |
|
|
148 | { |
|
|
149 | client &socket = *pl->ns; |
|
|
150 | object *ob = pl->observe; |
|
|
151 | |
|
|
152 | if (socket.mapinfocmd) |
|
|
153 | { |
|
|
154 | if (ob->map && ob->map->path[0]) |
|
|
155 | { |
|
|
156 | int flags = 0; |
|
|
157 | |
|
|
158 | if (ob->map->tile_path[0]) flags |= 1; |
|
|
159 | if (ob->map->tile_path[1]) flags |= 2; |
|
|
160 | if (ob->map->tile_path[2]) flags |= 4; |
|
|
161 | if (ob->map->tile_path[3]) flags |= 8; |
|
|
162 | |
|
|
163 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
|
|
164 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
165 | ob->map->width, ob->map->height, &ob->map->path); |
|
|
166 | } |
|
|
167 | else |
|
|
168 | socket.send_packet ("mapinfo current"); |
|
|
169 | } |
143 | } |
170 | } |
144 | |
171 | |
145 | /** check for map/region change and send new map data */ |
172 | /** check for map/region change and send new map data */ |
146 | static void |
173 | static void |
147 | check_map_change (player *pl) |
174 | check_map_change (player *pl) |
148 | { |
175 | { |
149 | client &socket = *pl->ns; |
176 | client &socket = *pl->ns; |
150 | object *ob = pl->observe; |
177 | object *ob = pl->observe; |
151 | |
178 | |
|
|
179 | region *reg = ob->region (); |
|
|
180 | if (socket.current_region != reg) |
|
|
181 | { |
|
|
182 | INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); |
|
|
183 | socket.current_region = reg; |
|
|
184 | } |
|
|
185 | |
|
|
186 | // first try to aovid a full newmap on tiled map scrolls |
|
|
187 | if (socket.current_map != ob->map && !socket.force_newmap) |
|
|
188 | { |
|
|
189 | rv_vector rv; |
|
|
190 | |
|
|
191 | get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); |
|
|
192 | |
|
|
193 | // manhattan distance is very handy here |
|
|
194 | if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient |
|
|
195 | { |
|
|
196 | socket.current_map = ob->map; |
|
|
197 | socket.current_x = ob->x; |
|
|
198 | socket.current_y = ob->y; |
|
|
199 | |
|
|
200 | socket_map_scroll (&socket, rv.distance_x, rv.distance_y); |
|
|
201 | socket.floorbox_reset (); |
|
|
202 | send_map_info (pl); |
|
|
203 | } |
|
|
204 | } |
|
|
205 | |
152 | if (socket.current_map != ob->map || socket.force_newmap) |
206 | if (socket.current_map != ob->map || socket.force_newmap) |
153 | { |
207 | { |
154 | clear_map (pl); |
208 | clear_map (pl); |
155 | socket.current_map = ob->map; |
209 | socket.current_map = ob->map; |
156 | |
210 | send_map_info (pl); |
157 | if (socket.mapinfocmd) |
|
|
158 | { |
|
|
159 | if (ob->map && ob->map->path[0]) |
|
|
160 | { |
|
|
161 | int flags = 0; |
|
|
162 | |
|
|
163 | if (ob->map->tile_path[0]) flags |= 1; |
|
|
164 | if (ob->map->tile_path[1]) flags |= 2; |
|
|
165 | if (ob->map->tile_path[2]) flags |= 4; |
|
|
166 | if (ob->map->tile_path[3]) flags |= 8; |
|
|
167 | |
|
|
168 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
|
|
169 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
170 | ob->map->width, ob->map->height, &ob->map->path); |
|
|
171 | } |
|
|
172 | else |
|
|
173 | socket.send_packet ("mapinfo current"); |
|
|
174 | } |
|
|
175 | } |
211 | } |
176 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
212 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
177 | { |
213 | { |
178 | int dx = ob->x - socket.current_x; |
214 | int dx = ob->x - socket.current_x; |
179 | int dy = ob->y - socket.current_y; |
215 | int dy = ob->y - socket.current_y; |
… | |
… | |
187 | } |
223 | } |
188 | } |
224 | } |
189 | |
225 | |
190 | socket.current_x = ob->x; |
226 | socket.current_x = ob->x; |
191 | socket.current_y = ob->y; |
227 | socket.current_y = ob->y; |
192 | |
|
|
193 | region *reg = ob->region (); |
|
|
194 | if (socket.current_region != reg) |
|
|
195 | { |
|
|
196 | socket.current_region = reg; |
|
|
197 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
198 | } |
|
|
199 | } |
228 | } |
200 | |
229 | |
201 | /** |
230 | /** |
202 | * RequestInfo is sort of a meta command. There is some specific |
231 | * RequestInfo is sort of a meta command. There is some specific |
203 | * request of information, but we call other functions to provide |
232 | * request of information, but we call other functions to provide |
204 | * that information. |
233 | * that information. |
205 | */ |
234 | */ |
206 | void |
235 | void |
207 | RequestInfo (char *buf, int len, client * ns) |
236 | RequestInfo (char *buf, int len, client *ns) |
208 | { |
237 | { |
209 | char *params = NULL, *cp; |
238 | char *params; |
210 | |
|
|
211 | /* No match */ |
|
|
212 | char bigbuf[MAX_BUF]; |
|
|
213 | int slen; |
|
|
214 | |
|
|
215 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
216 | * if we don't find a match. |
|
|
217 | */ |
|
|
218 | strcpy (bigbuf, "replyinfo "); |
|
|
219 | slen = strlen (bigbuf); |
|
|
220 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
221 | |
239 | |
222 | /* find the first space, make it null, and update the |
240 | /* find the first space, make it null, and update the |
223 | * params pointer. |
241 | * params pointer. |
224 | */ |
242 | */ |
225 | for (cp = buf; *cp != '\0'; cp++) |
243 | for (params = buf; *params; params++) |
226 | if (*cp == ' ') |
244 | if (*params == ' ') |
227 | { |
245 | { |
228 | *cp = '\0'; |
|
|
229 | params = cp + 1; |
246 | *params++ = 0; |
230 | break; |
247 | break; |
231 | } |
248 | } |
232 | |
249 | |
233 | if (!strcmp (buf, "image_info")) |
250 | if (!strcmp (buf, "image_info")) |
234 | send_image_info (ns, params); |
251 | send_image_info (ns, params); |
… | |
… | |
237 | else if (!strcmp (buf, "skill_info")) |
254 | else if (!strcmp (buf, "skill_info")) |
238 | send_skill_info (ns, params); |
255 | send_skill_info (ns, params); |
239 | else if (!strcmp (buf, "spell_paths")) |
256 | else if (!strcmp (buf, "spell_paths")) |
240 | send_spell_paths (ns, params); |
257 | send_spell_paths (ns, params); |
241 | else |
258 | else |
242 | ns->send_packet (bigbuf, len); |
259 | { |
|
|
260 | // undo tokenisation above and send replyinfo with the request unchanged |
|
|
261 | if (*params) |
|
|
262 | *--params = ' '; |
|
|
263 | |
|
|
264 | ns->send_packet_printf ("replyinfo %s", buf); |
|
|
265 | } |
243 | } |
266 | } |
244 | |
267 | |
245 | void |
268 | void |
246 | ExtCmd (char *buf, int len, player *pl) |
269 | ExtCmd (char *buf, int len, player *pl) |
247 | { |
270 | { |
… | |
… | |
250 | |
273 | |
251 | void |
274 | void |
252 | ExtiCmd (char *buf, int len, client *ns) |
275 | ExtiCmd (char *buf, int len, client *ns) |
253 | { |
276 | { |
254 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
277 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
278 | } |
|
|
279 | |
|
|
280 | void |
|
|
281 | client::mapinfo_queue_clear () |
|
|
282 | { |
|
|
283 | for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) |
|
|
284 | free (*i); |
|
|
285 | |
|
|
286 | mapinfo_queue.clear (); |
|
|
287 | } |
|
|
288 | |
|
|
289 | bool |
|
|
290 | client::mapinfo_try (char *buf) |
|
|
291 | { |
|
|
292 | char *token = buf; |
|
|
293 | buf += strlen (buf) + 9; |
|
|
294 | |
|
|
295 | // initial map and its origin |
|
|
296 | maptile *map = pl->observe->map; |
|
|
297 | int mapx = pl->ns->mapx / 2 - pl->observe->x; |
|
|
298 | int mapy = pl->ns->mapy / 2 - pl->observe->y; |
|
|
299 | int max_distance = 8; // limit maximum path length to something generous |
|
|
300 | |
|
|
301 | while (*buf && map && max_distance) |
|
|
302 | { |
|
|
303 | int dir = *buf++ - '1'; |
|
|
304 | |
|
|
305 | if (dir >= 0 && dir <= 3) |
|
|
306 | { |
|
|
307 | if (!map->tile_path [dir]) |
|
|
308 | map = 0; |
|
|
309 | else if (map->tile_available (dir, false)) |
|
|
310 | { |
|
|
311 | maptile *neigh = map->tile_map [dir]; |
|
|
312 | |
|
|
313 | switch (dir) |
|
|
314 | { |
|
|
315 | case 0: mapy -= neigh->height; break; |
|
|
316 | case 2: mapy += map ->height; break; |
|
|
317 | case 3: mapx -= neigh->width ; break; |
|
|
318 | case 1: mapx += map ->width ; break; |
|
|
319 | } |
|
|
320 | |
|
|
321 | map = neigh; |
|
|
322 | --max_distance; |
|
|
323 | } |
|
|
324 | else |
|
|
325 | return 0; |
|
|
326 | } |
|
|
327 | else |
|
|
328 | max_distance = 0; |
|
|
329 | } |
|
|
330 | |
|
|
331 | if (!max_distance) |
|
|
332 | send_packet_printf ("mapinfo %s error", token); |
|
|
333 | else if (!map || !map->path) |
|
|
334 | send_packet_printf ("mapinfo %s nomap", token); |
|
|
335 | else |
|
|
336 | { |
|
|
337 | int flags = 0; |
|
|
338 | |
|
|
339 | if (map->tile_path[0]) flags |= 1; |
|
|
340 | if (map->tile_path[1]) flags |= 2; |
|
|
341 | if (map->tile_path[2]) flags |= 4; |
|
|
342 | if (map->tile_path[3]) flags |= 8; |
|
|
343 | |
|
|
344 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
345 | } |
|
|
346 | |
|
|
347 | return 1; |
|
|
348 | } |
|
|
349 | |
|
|
350 | void |
|
|
351 | client::mapinfo_queue_run () |
|
|
352 | { |
|
|
353 | if (mapinfo_queue.empty () || !pl) |
|
|
354 | return; |
|
|
355 | |
|
|
356 | for (int i = 0; i < mapinfo_queue.size (); ++i) |
|
|
357 | if (mapinfo_try (mapinfo_queue [i])) |
|
|
358 | { |
|
|
359 | free (mapinfo_queue [i]); |
|
|
360 | mapinfo_queue.erase (i); |
|
|
361 | } |
|
|
362 | else |
|
|
363 | ++i; |
255 | } |
364 | } |
256 | |
365 | |
257 | void |
366 | void |
258 | MapInfoCmd (char *buf, int len, player *pl) |
367 | MapInfoCmd (char *buf, int len, player *pl) |
259 | { |
368 | { |
260 | // <mapinfo tag spatial tile-path |
369 | // <mapinfo tag spatial tile-path |
261 | // >mapinfo tag spatial flags x y w h hash |
370 | // >mapinfo tag spatial flags x y w h hash |
262 | |
371 | |
263 | char bigbuf[MAX_BUF], *token; |
|
|
264 | |
|
|
265 | token = buf; |
372 | char *token = buf; |
266 | // copy token |
373 | |
267 | if (!(buf = strchr (buf, ' '))) |
374 | if (!(buf = strchr (buf, ' '))) |
268 | return; |
375 | return; |
269 | |
376 | |
270 | *buf++ = 0; |
|
|
271 | |
|
|
272 | if (!strncmp (buf, "spatial ", 8)) |
377 | if (!strncmp (buf, " spatial ", 9)) |
273 | { |
378 | { |
274 | buf += 8; |
379 | char *copy = strdup (token); |
|
|
380 | copy [buf - token] = 0; |
275 | |
381 | |
276 | // initial map and its origin |
382 | #if 0 |
277 | maptile *map = pl->ob->map; |
383 | // this makes only sense when we flush the buffer immediately |
278 | sint16 dx, dy; |
384 | if (pl->ns->mapinfo_try (copy)) |
279 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
385 | free (copy); |
280 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
|
|
281 | int max_distance = 8; // limit maximum path length to something generous |
|
|
282 | |
|
|
283 | while (*buf && map && max_distance) |
|
|
284 | { |
|
|
285 | int dir = *buf++; |
|
|
286 | |
|
|
287 | switch (dir) |
|
|
288 | { |
|
|
289 | case '1': |
|
|
290 | dx = 0; |
|
|
291 | dy = -1; |
|
|
292 | map = map->xy_find (dx, dy); |
|
|
293 | map && (mapy -= map->height); |
|
|
294 | break; |
|
|
295 | case '2': |
|
|
296 | mapx += map->width; |
|
|
297 | dx = map->width; |
|
|
298 | dy = 0; |
|
|
299 | map = map->xy_find (dx, dy); |
|
|
300 | break; |
|
|
301 | case '3': |
|
|
302 | mapy += map->height; |
|
|
303 | dx = 0; |
|
|
304 | dy = map->height; |
|
|
305 | map = map->xy_find (dx, dy); |
|
|
306 | break; |
|
|
307 | case '4': |
|
|
308 | dx = -1; |
|
|
309 | dy = 0; |
|
|
310 | map = map->xy_find (dx, dy); |
|
|
311 | map && (mapx -= map->width); |
|
|
312 | break; |
|
|
313 | } |
|
|
314 | |
|
|
315 | --max_distance; |
|
|
316 | } |
|
|
317 | |
|
|
318 | if (!max_distance) |
|
|
319 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
|
|
320 | else if (map && map->path[0]) |
|
|
321 | { |
|
|
322 | int flags = 0; |
|
|
323 | |
|
|
324 | if (map->tile_path[0]) flags |= 1; |
|
|
325 | if (map->tile_path[1]) flags |= 2; |
|
|
326 | if (map->tile_path[2]) flags |= 4; |
|
|
327 | if (map->tile_path[3]) flags |= 8; |
|
|
328 | |
|
|
329 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
330 | } |
|
|
331 | else |
386 | else |
332 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
387 | #endif |
|
|
388 | pl->ns->mapinfo_queue.push_back (copy); |
333 | } |
389 | } |
334 | else |
390 | else |
335 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
391 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
336 | |
|
|
337 | pl->ns->send_packet (bigbuf); |
|
|
338 | } |
392 | } |
339 | |
393 | |
340 | /** This is the Setup cmd */ |
394 | /** This is the Setup cmd */ |
341 | void |
395 | void |
342 | SetUp (char *buf, int len, client * ns) |
396 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
471 | |
525 | |
472 | ns->send_packet (cmdback); |
526 | ns->send_packet (cmdback); |
473 | } |
527 | } |
474 | |
528 | |
475 | /** |
529 | /** |
476 | * client requested an image. send it rate-limited |
|
|
477 | * before flushing. |
|
|
478 | */ |
|
|
479 | void |
|
|
480 | AskFaceCmd (char *buf, int len, client *ns) |
|
|
481 | { |
|
|
482 | ns->ixface.push_back (atoi (buf)); |
|
|
483 | } |
|
|
484 | |
|
|
485 | /** |
|
|
486 | * Tells client the picture it has to use |
|
|
487 | * to smooth a picture number given as argument. |
|
|
488 | */ |
|
|
489 | void |
|
|
490 | AskSmooth (char *buf, int len, client *ns) |
|
|
491 | { |
|
|
492 | ns->send_face (atoi (buf)); |
|
|
493 | ns->flush_fx (); |
|
|
494 | } |
|
|
495 | |
|
|
496 | /** |
|
|
497 | * This handles the general commands from the client (ie, north, fire, cast, |
530 | * This handles the general commands from the client (ie, north, fire, cast, |
498 | * etc.) |
531 | * etc.) |
499 | */ |
532 | */ |
500 | void |
533 | void |
501 | PlayerCmd (char *buf, int len, player *pl) |
534 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
533 | void |
566 | void |
534 | NewPlayerCmd (char *buf, int len, player *pl) |
567 | NewPlayerCmd (char *buf, int len, player *pl) |
535 | { |
568 | { |
536 | if (len <= 6) |
569 | if (len <= 6) |
537 | { |
570 | { |
538 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
571 | LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); |
539 | return; |
572 | return; |
540 | } |
573 | } |
541 | |
574 | |
542 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
575 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
543 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
576 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
… | |
… | |
681 | * syntax is: move (to) (tag) (nrof) |
714 | * syntax is: move (to) (tag) (nrof) |
682 | */ |
715 | */ |
683 | void |
716 | void |
684 | MoveCmd (char *buf, int len, player *pl) |
717 | MoveCmd (char *buf, int len, player *pl) |
685 | { |
718 | { |
686 | int vals[3], i; |
719 | int to, tag, nrof; |
687 | |
720 | |
688 | /* A little funky here. We only cycle for 2 records, because |
721 | if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof)) |
689 | * we obviously are not going to find a space after the third |
|
|
690 | * record. Perhaps we should just replace this with a |
|
|
691 | * sscanf? |
|
|
692 | */ |
|
|
693 | for (i = 0; i < 2; i++) |
|
|
694 | { |
722 | { |
695 | vals[i] = atoi (buf); |
|
|
696 | |
|
|
697 | if (!(buf = strchr (buf, ' '))) |
|
|
698 | { |
|
|
699 | LOG (llevError, "Incomplete move command: %s\n", buf); |
723 | LOG (llevError, "Incomplete move command: %s\n", buf); |
700 | return; |
724 | return; |
701 | } |
|
|
702 | |
|
|
703 | buf++; |
|
|
704 | } |
725 | } |
705 | |
726 | |
706 | vals[2] = atoi (buf); |
727 | esrv_move_object (pl->ob, to, tag, nrof); |
707 | |
|
|
708 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
|
|
709 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
|
|
710 | } |
728 | } |
711 | |
729 | |
712 | /****************************************************************************** |
730 | /****************************************************************************** |
713 | * |
731 | * |
714 | * Start of commands the server sends to the client. |
732 | * Start of commands the server sends to the client. |
… | |
… | |
815 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
833 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
816 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
834 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
817 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
835 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
818 | |
836 | |
819 | for (int s = 0; s < NUM_SKILLS; s++) |
837 | for (int s = 0; s < NUM_SKILLS; s++) |
820 | if (object *skill = opl->last_skill_ob[s]) |
838 | if (object *skill = opl->last_skill_ob [s]) |
821 | if (skill->stats.exp != ns->last_skill_exp [s]) |
839 | if (skill->stats.exp != ns->last_skill_exp [s]) |
822 | { |
840 | { |
823 | ns->last_skill_exp [s] = skill->stats.exp; |
841 | ns->last_skill_exp [s] = skill->stats.exp; |
824 | |
842 | |
825 | /* Always send along the level if exp changes. This is only |
843 | /* Always send along the level if exp changes. This is only |
… | |
… | |
881 | |
899 | |
882 | /** |
900 | /** |
883 | * Tells the client that here is a player it should start using. |
901 | * Tells the client that here is a player it should start using. |
884 | */ |
902 | */ |
885 | void |
903 | void |
886 | esrv_new_player (player *pl, uint32 weight) |
904 | esrv_new_player (player *pl) |
887 | { |
905 | { |
|
|
906 | sint32 weight = pl->ob->client_weight (); |
|
|
907 | |
888 | packet sl ("player"); |
908 | packet sl ("player"); |
889 | |
909 | |
890 | sl << uint32 (pl->ob->count) |
910 | sl << uint32 (pl->ob->count) |
891 | << uint32 (weight) |
911 | << uint32 (weight) |
892 | << uint32 (pl->ob->face) |
912 | << uint32 (pl->ob->face) |
893 | << data8 (pl->ob->name); |
913 | << data8 (pl->ob->name); |
894 | |
914 | |
895 | pl->ns->last_weight = weight; |
915 | pl->ns->last_weight = weight; |
896 | pl->ns->send_packet (sl); |
916 | pl->ns->send_packet (sl); |
897 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
|
|
898 | } |
917 | } |
899 | |
918 | |
900 | /****************************************************************************** |
919 | /****************************************************************************** |
901 | * |
920 | * |
902 | * Start of map related commands. |
921 | * Start of map related commands. |
… | |
… | |
959 | |
978 | |
960 | if (!ns.faces_sent[face_num]) |
979 | if (!ns.faces_sent[face_num]) |
961 | if (ob) |
980 | if (ob) |
962 | ns.send_faces (ob); |
981 | ns.send_faces (ob); |
963 | else |
982 | else |
964 | ns.send_face (face_num); |
983 | ns.send_face (face_num, 10); |
965 | |
984 | |
966 | sl << uint16 (face_num); |
985 | sl << uint16 (face_num); |
967 | return 1; |
986 | return 1; |
968 | } |
987 | } |
969 | |
988 | |
… | |
… | |
1020 | { |
1039 | { |
1021 | object *ob = pl->observe; |
1040 | object *ob = pl->observe; |
1022 | if (!ob->active) |
1041 | if (!ob->active) |
1023 | return; |
1042 | return; |
1024 | |
1043 | |
1025 | maptile *plmap = ob->map; |
|
|
1026 | |
|
|
1027 | /* If player is just joining the game, he isn't here yet, so the map |
1044 | /* If player is just joining the game, he isn't here yet, so the map |
1028 | * can get swapped out. If so, don't try to send them a map. All will |
1045 | * can get swapped out. If so, don't try to send them a map. All will |
1029 | * be OK once they really log in. |
1046 | * be OK once they really log in. |
1030 | */ |
1047 | */ |
1031 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
1048 | if (!ob->map || ob->map->in_memory != MAP_ACTIVE) |
1032 | return; |
1049 | return; |
1033 | |
1050 | |
1034 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1051 | int startlen, oldlen; |
1035 | int estartlen, eoldlen; |
1052 | int estartlen, eoldlen; |
1036 | uint8 eentrysize; |
1053 | uint8 eentrysize; |
1037 | uint16 ewhatstart, ewhatflag; |
1054 | uint16 ewhatstart, ewhatflag; |
1038 | uint8 extendedinfos; |
1055 | uint8 extendedinfos; |
1039 | |
1056 | |
… | |
… | |
1096 | << uint8 (eentrysize); |
1113 | << uint8 (eentrysize); |
1097 | |
1114 | |
1098 | estartlen = esl.length (); |
1115 | estartlen = esl.length (); |
1099 | } |
1116 | } |
1100 | |
1117 | |
1101 | /* x,y are the real map locations. ax, ay are viewport relative |
|
|
1102 | * locations. |
|
|
1103 | */ |
|
|
1104 | ay = 0; |
|
|
1105 | |
|
|
1106 | /* We could do this logic as conditionals in the if statement, |
1118 | /* We could do this logic as conditionals in the if statement, |
1107 | * but that started to get a bit messy to look at. |
1119 | * but that started to get a bit messy to look at. |
1108 | */ |
1120 | */ |
1109 | max_x = ob->x + (socket.mapx + 1) / 2; |
1121 | int hx = socket.mapx / 2; |
1110 | max_y = ob->y + (socket.mapy + 1) / 2; |
1122 | int hy = socket.mapy / 2; |
1111 | |
1123 | |
1112 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1124 | for (int dx = -hx; dx <= hx; dx++) |
1113 | { |
1125 | { |
1114 | sint16 nx, ny; |
1126 | sint16 nx, ny; |
1115 | maptile *m = 0; |
1127 | maptile *m = 0; |
1116 | |
1128 | |
1117 | ax = 0; |
1129 | for (int dy = -hy; dy <= hy; dy++) |
1118 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
|
|
1119 | { |
1130 | { |
1120 | // check to see if we can simply go one right quickly |
1131 | // check to see if we can simply go one down quickly |
1121 | ++nx; |
|
|
1122 | if (m && nx >= m->width) |
1132 | if (m && ++ny >= m->height) |
1123 | m = 0; |
1133 | m = 0; |
1124 | |
1134 | |
|
|
1135 | // no, so do it the slow way |
1125 | if (!m) |
1136 | if (!m) |
1126 | { |
1137 | { |
1127 | nx = x; ny = y; m = plmap; |
1138 | nx = ob->x + dx; ny = ob->y + dy; m = ob->map; |
1128 | |
1139 | |
1129 | if (!xy_normalise (m, nx, ny)) |
1140 | if (xy_normalise (m, nx, ny)) |
|
|
1141 | m->touch (); |
|
|
1142 | else |
1130 | m = 0; |
1143 | m = 0; |
1131 | } |
1144 | } |
|
|
1145 | |
|
|
1146 | int ax = dx + hx; |
|
|
1147 | int ay = dy + hy; |
1132 | |
1148 | |
1133 | int emask, mask; |
1149 | int emask, mask; |
1134 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1150 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1135 | |
1151 | |
1136 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1152 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
… | |
… | |
1138 | /* If the coordinates are not valid, or it is too dark to see, |
1154 | /* If the coordinates are not valid, or it is too dark to see, |
1139 | * we tell the client as such |
1155 | * we tell the client as such |
1140 | */ |
1156 | */ |
1141 | if (!m) |
1157 | if (!m) |
1142 | { |
1158 | { |
1143 | /* space is out of map. Update space and clear values |
1159 | /* space is out of map. Update space and clear values |
1144 | * if this hasn't already been done. If the space is out |
1160 | * if this hasn't already been done. If the space is out |
1145 | * of the map, it shouldn't have a head |
1161 | * of the map, it shouldn't have a head. |
1146 | */ |
1162 | */ |
1147 | if (lastcell.count != -1) |
1163 | if (lastcell.count != -1) |
1148 | { |
1164 | { |
1149 | sl << uint16 (mask); |
1165 | sl << uint16 (mask); |
1150 | map_clearcell (&lastcell, -1); |
1166 | map_clearcell (&lastcell, -1); |
1151 | } |
1167 | } |
1152 | |
1168 | |
1153 | continue; |
1169 | continue; |
1154 | } |
1170 | } |
1155 | |
1171 | |
1156 | m->touch (); |
|
|
1157 | |
|
|
1158 | int d = pl->blocked_los[ax][ay]; |
1172 | int d = pl->blocked_los_uc (dx, dy); |
1159 | |
1173 | |
1160 | if (d > 3) |
1174 | if (d > 3) |
1161 | { |
1175 | { |
1162 | |
|
|
1163 | int need_send = 0, count; |
1176 | int need_send = 0, count; |
1164 | |
1177 | |
1165 | /* This block deals with spaces that are not visible for whatever |
1178 | /* This block deals with spaces that are not visible for whatever |
1166 | * reason. Still may need to send the head for this space. |
1179 | * reason. Still may need to send the head for this space. |
1167 | */ |
1180 | */ |
… | |
… | |
1173 | if (lastcell.count != -1) |
1186 | if (lastcell.count != -1) |
1174 | need_send = 1; |
1187 | need_send = 1; |
1175 | |
1188 | |
1176 | count = -1; |
1189 | count = -1; |
1177 | |
1190 | |
1178 | /* properly clear a previously sent big face */ |
|
|
1179 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1191 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1180 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1192 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1181 | need_send = 1; |
1193 | need_send = 1; |
1182 | |
1194 | |
|
|
1195 | /* properly clear a previously sent big face */ |
1183 | map_clearcell (&lastcell, count); |
1196 | map_clearcell (&lastcell, count); |
1184 | |
1197 | |
1185 | if ((mask & 0xf) || need_send) |
1198 | if ((mask & 0xf) || need_send) |
1186 | sl[oldlen + 1] = mask & 0xff; |
1199 | sl[oldlen + 1] = mask & 0xff; |
1187 | else |
1200 | else |
… | |
… | |
1237 | uint8 flags = 0; |
1250 | uint8 flags = 0; |
1238 | tag_t player = 0; |
1251 | tag_t player = 0; |
1239 | |
1252 | |
1240 | // send hp information, if applicable |
1253 | // send hp information, if applicable |
1241 | if (object *op = ms.faces_obj [0]) |
1254 | if (object *op = ms.faces_obj [0]) |
1242 | { |
|
|
1243 | if (op->head || op->invisible) |
1255 | if (op->is_head () && !op->invisible) |
1244 | ; // do not show |
|
|
1245 | else if (op->type == PLAYER |
|
|
1246 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
|
|
1247 | { |
1256 | { |
1248 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
1257 | if (op->stats.maxhp > op->stats.hp |
|
|
1258 | && op->stats.maxhp > 0 |
|
|
1259 | && (op->type == PLAYER |
|
|
1260 | || op->type == DOOR // does not work, have maxhp 0 |
|
|
1261 | || QUERY_FLAG (op, FLAG_MONSTER) |
|
|
1262 | || QUERY_FLAG (op, FLAG_ALIVE) |
|
|
1263 | || QUERY_FLAG (op, FLAG_GENERATOR))) |
1249 | { |
1264 | { |
1250 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1265 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1251 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1266 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1252 | } |
1267 | } |
1253 | } |
|
|
1254 | |
1268 | |
1255 | if (op->msg && op->msg[0] == '@') |
1269 | if (op->has_dialogue ()) |
1256 | flags |= 1; |
1270 | flags |= 1; |
1257 | |
1271 | |
1258 | if (op->type == PLAYER && op != ob) |
1272 | if (op->type == PLAYER) |
1259 | player = op->count; |
1273 | player = op == ob ? pl->ob->count |
|
|
1274 | : op == pl->ob ? ob->count |
|
|
1275 | : op->count; |
1260 | } |
1276 | } |
1261 | |
1277 | |
1262 | if (lastcell.stat_hp != stat_hp) |
1278 | if (lastcell.stat_hp != stat_hp) |
1263 | { |
1279 | { |
1264 | lastcell.stat_hp = stat_hp; |
1280 | lastcell.stat_hp = stat_hp; |
1265 | |
1281 | |
… | |
… | |
1307 | |
1323 | |
1308 | /* Middle face */ |
1324 | /* Middle face */ |
1309 | if (update_space (sl, socket, ms, lastcell, 1)) |
1325 | if (update_space (sl, socket, ms, lastcell, 1)) |
1310 | mask |= 0x2; |
1326 | mask |= 0x2; |
1311 | |
1327 | |
|
|
1328 | if (ob->invisible |
|
|
1329 | && ob->invisible & (ob->invisible < 50 ? 1 : 7) |
1312 | if (ms.player () == ob |
1330 | && ms.player () == ob) |
1313 | && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) |
|
|
1314 | { |
1331 | { |
1315 | // force player to be visible to himself if invisible |
1332 | // force player to be visible to himself if invisible |
1316 | if (lastcell.faces[0] != ob->face) |
1333 | if (lastcell.faces[0] != ob->face) |
1317 | { |
1334 | { |
1318 | lastcell.faces[0] = ob->face; |
1335 | lastcell.faces[0] = ob->face; |
… | |
… | |
1414 | { |
1431 | { |
1415 | packet sl; |
1432 | packet sl; |
1416 | sl << "replyinfo skill_info\n"; |
1433 | sl << "replyinfo skill_info\n"; |
1417 | |
1434 | |
1418 | for (int i = 1; i < NUM_SKILLS; i++) |
1435 | for (int i = 1; i < NUM_SKILLS; i++) |
1419 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1436 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); |
1420 | |
1437 | |
1421 | if (sl.length () >= MAXSOCKBUF) |
1438 | if (sl.length () > MAXSOCKBUF) |
1422 | { |
1439 | { |
1423 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1440 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1424 | fatal (0); |
1441 | fatal (0); |
1425 | } |
1442 | } |
1426 | |
1443 | |
… | |
… | |
1439 | sl << "replyinfo spell_paths\n"; |
1456 | sl << "replyinfo spell_paths\n"; |
1440 | |
1457 | |
1441 | for (int i = 0; i < NRSPELLPATHS; i++) |
1458 | for (int i = 0; i < NRSPELLPATHS; i++) |
1442 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1459 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1443 | |
1460 | |
1444 | if (sl.length () >= MAXSOCKBUF) |
1461 | if (sl.length () > MAXSOCKBUF) |
1445 | { |
1462 | { |
1446 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1463 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1447 | fatal (0); |
1464 | fatal (0); |
1448 | } |
1465 | } |
1449 | |
1466 | |
… | |
… | |
1468 | if (spell->type == SPELL) |
1485 | if (spell->type == SPELL) |
1469 | { |
1486 | { |
1470 | int flags = 0; |
1487 | int flags = 0; |
1471 | |
1488 | |
1472 | /* check if we need to update it */ |
1489 | /* check if we need to update it */ |
1473 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1490 | if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1474 | { |
1491 | { |
1475 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1492 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1476 | flags |= UPD_SP_MANA; |
1493 | flags |= UPD_SP_MANA; |
1477 | } |
1494 | } |
1478 | |
1495 | |
1479 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1496 | if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1480 | { |
1497 | { |
1481 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1498 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1482 | flags |= UPD_SP_GRACE; |
1499 | flags |= UPD_SP_GRACE; |
1483 | } |
1500 | } |
1484 | |
1501 | |
1485 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1502 | if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1486 | { |
1503 | { |
1487 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1504 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1488 | flags |= UPD_SP_DAMAGE; |
1505 | flags |= UPD_SP_DAMAGE; |
1489 | } |
1506 | } |
1490 | |
1507 | |
1491 | if (flags) |
1508 | if (flags) |
1492 | { |
1509 | { |
… | |
… | |
1494 | |
1511 | |
1495 | sl << "updspell " |
1512 | sl << "updspell " |
1496 | << uint8 (flags) |
1513 | << uint8 (flags) |
1497 | << uint32 (spell->count); |
1514 | << uint32 (spell->count); |
1498 | |
1515 | |
1499 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1516 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); |
1500 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1517 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); |
1501 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1518 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); |
1502 | |
1519 | |
1503 | pl->ns->send_packet (sl); |
1520 | pl->ns->send_packet (sl); |
1504 | } |
1521 | } |
1505 | } |
1522 | } |
1506 | } |
1523 | } |
… | |
… | |
1536 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1553 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1537 | return; |
1554 | return; |
1538 | } |
1555 | } |
1539 | |
1556 | |
1540 | /* store costs and damage in the object struct, to compare to later */ |
1557 | /* store costs and damage in the object struct, to compare to later */ |
1541 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1558 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1542 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1559 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1543 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1560 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1544 | |
1561 | |
1545 | /* figure out which skill it uses, if it uses one */ |
1562 | /* figure out which skill it uses, if it uses one */ |
1546 | if (spell->skill) |
1563 | if (spell->skill) |
1547 | { |
1564 | if (object *tmp = pl->find_skill (spell->skill)) |
1548 | for (i = 1; i < NUM_SKILLS; i++) |
|
|
1549 | if (!strcmp (spell->skill, skill_names[i])) |
|
|
1550 | { |
|
|
1551 | skill = i + CS_STAT_SKILLINFO; |
1565 | skill = tmp->subtype + CS_STAT_SKILLINFO; |
1552 | break; |
|
|
1553 | } |
|
|
1554 | } |
|
|
1555 | |
1566 | |
1556 | // spells better have a face |
1567 | // spells better have a face |
1557 | if (!spell->face) |
1568 | if (!spell->face) |
1558 | { |
1569 | { |
1559 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1570 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1560 | spell->face = face_find ("burnout.x11", blank_face); |
1571 | spell->face = face_find ("burnout.x11", blank_face); |
1561 | } |
1572 | } |
|
|
1573 | |
|
|
1574 | pl->ns->send_face (spell->face); |
1562 | |
1575 | |
1563 | /* send the current values */ |
1576 | /* send the current values */ |
1564 | sl << uint32 (spell->count) |
1577 | sl << uint32 (spell->count) |
1565 | << uint16 (spell->level) |
1578 | << uint16 (spell->level) |
1566 | << uint16 (spell->casting_time) |
1579 | << uint16 (spell->casting_time) |
1567 | << uint16 (spell->last_sp) |
1580 | << uint16 (spell->cached_sp) |
1568 | << uint16 (spell->last_grace) |
1581 | << uint16 (spell->cached_grace) |
1569 | << uint16 (spell->last_eat) |
1582 | << uint16 (spell->cached_eat) |
1570 | << uint8 (skill) |
1583 | << uint8 (skill) |
1571 | << uint32 (spell->path_attuned) |
1584 | << uint32 (spell->path_attuned) |
1572 | << uint32 (spell->face) |
1585 | << uint32 (spell->face) |
1573 | << data8 (spell->name) |
1586 | << data8 (spell->name) |
1574 | << data16 (spell->msg); |
1587 | << data16 (spell->msg); |
… | |
… | |
1602 | * bytes and 3 strings (because that is the spec) so we need to |
1615 | * bytes and 3 strings (because that is the spec) so we need to |
1603 | * check that the length of those 3 strings, plus the 23 bytes, |
1616 | * check that the length of those 3 strings, plus the 23 bytes, |
1604 | * won't take us over the length limit for the socket, if it does, |
1617 | * won't take us over the length limit for the socket, if it does, |
1605 | * we need to send what we already have, and restart packet formation |
1618 | * we need to send what we already have, and restart packet formation |
1606 | */ |
1619 | */ |
|
|
1620 | if (spell->type != SPELL) |
|
|
1621 | continue; |
|
|
1622 | |
1607 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1623 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1608 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1624 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1609 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1625 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1610 | * like it will fix this |
1626 | * like it will fix this |
1611 | */ |
1627 | */ |
1612 | if (spell->type != SPELL) |
|
|
1613 | continue; |
|
|
1614 | |
|
|
1615 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1628 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1616 | { |
1629 | { |
|
|
1630 | pl->ns->flush_fx (); |
1617 | pl->ns->send_packet (sl); |
1631 | pl->ns->send_packet (sl); |
1618 | |
1632 | |
1619 | sl.reset (); |
1633 | sl.reset (); |
1620 | sl << "addspell "; |
1634 | sl << "addspell "; |
1621 | } |
1635 | } |
… | |
… | |
1629 | return; |
1643 | return; |
1630 | } |
1644 | } |
1631 | else |
1645 | else |
1632 | append_spell (pl, sl, spell); |
1646 | append_spell (pl, sl, spell); |
1633 | |
1647 | |
1634 | if (sl.length () >= MAXSOCKBUF) |
1648 | if (sl.length () > MAXSOCKBUF) |
1635 | { |
1649 | { |
1636 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1650 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1637 | fatal (0); |
1651 | fatal (0); |
1638 | } |
1652 | } |
1639 | |
1653 | |
1640 | /* finally, we can send the packet */ |
1654 | /* finally, we can send the packet */ |
|
|
1655 | pl->ns->flush_fx (); |
1641 | pl->ns->send_packet (sl); |
1656 | pl->ns->send_packet (sl); |
1642 | } |
1657 | } |
1643 | |
1658 | |