1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
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 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 |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) 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, |
13 | * This program is distributed in the hope that it will be useful, |
… | |
… | |
16 | * GNU General Public License 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 |
18 | * You should have received a copy of the GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * |
20 | * |
21 | * 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> |
22 | */ |
22 | */ |
23 | |
23 | |
24 | /** |
24 | /** |
25 | * \file |
25 | * \file |
26 | * Client handling. |
26 | * Client handling. |
… | |
… | |
129 | } |
129 | } |
130 | |
130 | |
131 | static void |
131 | static void |
132 | clear_map (player *pl) |
132 | clear_map (player *pl) |
133 | { |
133 | { |
|
|
134 | pl->ns->mapinfo_queue_clear (); |
|
|
135 | |
134 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
135 | |
137 | |
136 | pl->ns->force_newmap = false; |
138 | pl->ns->force_newmap = false; |
137 | |
139 | |
138 | if (pl->ns->newmapcmd == 1) |
140 | if (pl->ns->newmapcmd == 1) |
… | |
… | |
190 | socket.current_y = ob->y; |
192 | socket.current_y = ob->y; |
191 | |
193 | |
192 | region *reg = ob->region (); |
194 | region *reg = ob->region (); |
193 | if (socket.current_region != reg) |
195 | if (socket.current_region != reg) |
194 | { |
196 | { |
|
|
197 | INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); |
195 | socket.current_region = reg; |
198 | socket.current_region = reg; |
196 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
197 | } |
199 | } |
198 | } |
200 | } |
199 | |
201 | |
200 | /** |
202 | /** |
201 | * RequestInfo is sort of a meta command. There is some specific |
203 | * RequestInfo is sort of a meta command. There is some specific |
202 | * request of information, but we call other functions to provide |
204 | * request of information, but we call other functions to provide |
203 | * that information. |
205 | * that information. |
204 | */ |
206 | */ |
205 | void |
207 | void |
206 | RequestInfo (char *buf, int len, client * ns) |
208 | RequestInfo (char *buf, int len, client *ns) |
207 | { |
209 | { |
208 | char *params = NULL, *cp; |
210 | char *params; |
209 | |
|
|
210 | /* No match */ |
|
|
211 | char bigbuf[MAX_BUF]; |
|
|
212 | int slen; |
|
|
213 | |
|
|
214 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
215 | * if we don't find a match. |
|
|
216 | */ |
|
|
217 | strcpy (bigbuf, "replyinfo "); |
|
|
218 | slen = strlen (bigbuf); |
|
|
219 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
220 | |
211 | |
221 | /* find the first space, make it null, and update the |
212 | /* find the first space, make it null, and update the |
222 | * params pointer. |
213 | * params pointer. |
223 | */ |
214 | */ |
224 | for (cp = buf; *cp != '\0'; cp++) |
215 | for (params = buf; *params; params++) |
225 | if (*cp == ' ') |
216 | if (*params == ' ') |
226 | { |
217 | { |
227 | *cp = '\0'; |
|
|
228 | params = cp + 1; |
218 | *params++ = 0; |
229 | break; |
219 | break; |
230 | } |
220 | } |
231 | |
221 | |
232 | if (!strcmp (buf, "image_info")) |
222 | if (!strcmp (buf, "image_info")) |
233 | send_image_info (ns, params); |
223 | send_image_info (ns, params); |
… | |
… | |
236 | else if (!strcmp (buf, "skill_info")) |
226 | else if (!strcmp (buf, "skill_info")) |
237 | send_skill_info (ns, params); |
227 | send_skill_info (ns, params); |
238 | else if (!strcmp (buf, "spell_paths")) |
228 | else if (!strcmp (buf, "spell_paths")) |
239 | send_spell_paths (ns, params); |
229 | send_spell_paths (ns, params); |
240 | else |
230 | else |
241 | ns->send_packet (bigbuf, len); |
231 | { |
|
|
232 | // undo tokenisation above and send replyinfo with the request unchanged |
|
|
233 | if (*params) |
|
|
234 | *--params = ' '; |
|
|
235 | |
|
|
236 | ns->send_packet_printf ("replyinfo %s", buf); |
|
|
237 | } |
242 | } |
238 | } |
243 | |
239 | |
244 | void |
240 | void |
245 | ExtCmd (char *buf, int len, player *pl) |
241 | ExtCmd (char *buf, int len, player *pl) |
246 | { |
242 | { |
… | |
… | |
249 | |
245 | |
250 | void |
246 | void |
251 | ExtiCmd (char *buf, int len, client *ns) |
247 | ExtiCmd (char *buf, int len, client *ns) |
252 | { |
248 | { |
253 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
249 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
250 | } |
|
|
251 | |
|
|
252 | void |
|
|
253 | client::mapinfo_queue_clear () |
|
|
254 | { |
|
|
255 | for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) |
|
|
256 | free (*i); |
|
|
257 | |
|
|
258 | mapinfo_queue.clear (); |
|
|
259 | } |
|
|
260 | |
|
|
261 | bool |
|
|
262 | client::mapinfo_try (char *buf) |
|
|
263 | { |
|
|
264 | char *token = buf; |
|
|
265 | buf += strlen (buf) + 9; |
|
|
266 | |
|
|
267 | // initial map and its origin |
|
|
268 | maptile *map = pl->observe->map; |
|
|
269 | int mapx = pl->ns->mapx / 2 - pl->observe->x; |
|
|
270 | int mapy = pl->ns->mapy / 2 - pl->observe->y; |
|
|
271 | int max_distance = 8; // limit maximum path length to something generous |
|
|
272 | |
|
|
273 | while (*buf && map && max_distance) |
|
|
274 | { |
|
|
275 | int dir = *buf++ - '1'; |
|
|
276 | |
|
|
277 | if (dir >= 0 && dir <= 3) |
|
|
278 | { |
|
|
279 | if (!map->tile_path [dir]) |
|
|
280 | map = 0; |
|
|
281 | else if (map->tile_available (dir, false)) |
|
|
282 | { |
|
|
283 | maptile *neigh = map->tile_map [dir]; |
|
|
284 | |
|
|
285 | switch (dir) |
|
|
286 | { |
|
|
287 | case 0: mapy -= neigh->height; break; |
|
|
288 | case 2: mapy += map ->height; break; |
|
|
289 | case 3: mapx -= neigh->width ; break; |
|
|
290 | case 1: mapx += map ->width ; break; |
|
|
291 | } |
|
|
292 | |
|
|
293 | map = neigh; |
|
|
294 | --max_distance; |
|
|
295 | } |
|
|
296 | else |
|
|
297 | return 0; |
|
|
298 | } |
|
|
299 | else |
|
|
300 | max_distance = 0; |
|
|
301 | } |
|
|
302 | |
|
|
303 | if (!max_distance) |
|
|
304 | send_packet_printf ("mapinfo %s error", token); |
|
|
305 | else if (!map || !map->path) |
|
|
306 | send_packet_printf ("mapinfo %s nomap", token); |
|
|
307 | else |
|
|
308 | { |
|
|
309 | int flags = 0; |
|
|
310 | |
|
|
311 | if (map->tile_path[0]) flags |= 1; |
|
|
312 | if (map->tile_path[1]) flags |= 2; |
|
|
313 | if (map->tile_path[2]) flags |= 4; |
|
|
314 | if (map->tile_path[3]) flags |= 8; |
|
|
315 | |
|
|
316 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
317 | } |
|
|
318 | |
|
|
319 | return 1; |
|
|
320 | } |
|
|
321 | |
|
|
322 | void |
|
|
323 | client::mapinfo_queue_run () |
|
|
324 | { |
|
|
325 | if (mapinfo_queue.empty () || !pl) |
|
|
326 | return; |
|
|
327 | |
|
|
328 | for (int i = 0; i < mapinfo_queue.size (); ++i) |
|
|
329 | if (mapinfo_try (mapinfo_queue [i])) |
|
|
330 | { |
|
|
331 | free (mapinfo_queue [i]); |
|
|
332 | mapinfo_queue.erase (i); |
|
|
333 | } |
|
|
334 | else |
|
|
335 | ++i; |
254 | } |
336 | } |
255 | |
337 | |
256 | void |
338 | void |
257 | MapInfoCmd (char *buf, int len, player *pl) |
339 | MapInfoCmd (char *buf, int len, player *pl) |
258 | { |
340 | { |
259 | // <mapinfo tag spatial tile-path |
341 | // <mapinfo tag spatial tile-path |
260 | // >mapinfo tag spatial flags x y w h hash |
342 | // >mapinfo tag spatial flags x y w h hash |
261 | |
343 | |
262 | char bigbuf[MAX_BUF], *token; |
|
|
263 | |
|
|
264 | token = buf; |
344 | char *token = buf; |
265 | // copy token |
345 | |
266 | if (!(buf = strchr (buf, ' '))) |
346 | if (!(buf = strchr (buf, ' '))) |
267 | return; |
347 | return; |
268 | |
348 | |
269 | *buf++ = 0; |
|
|
270 | |
|
|
271 | if (!strncmp (buf, "spatial ", 8)) |
349 | if (!strncmp (buf, " spatial ", 9)) |
272 | { |
350 | { |
273 | buf += 8; |
351 | char *copy = strdup (token); |
|
|
352 | copy [buf - token] = 0; |
274 | |
353 | |
275 | // initial map and its origin |
354 | #if 0 |
276 | maptile *map = pl->ob->map; |
355 | // this makes only sense when we flush the buffer immediately |
277 | sint16 dx, dy; |
356 | if (pl->ns->mapinfo_try (copy)) |
278 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
357 | free (copy); |
279 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
|
|
280 | int max_distance = 8; // limit maximum path length to something generous |
|
|
281 | |
|
|
282 | while (*buf && map && max_distance) |
|
|
283 | { |
|
|
284 | int dir = *buf++; |
|
|
285 | |
|
|
286 | switch (dir) |
|
|
287 | { |
|
|
288 | case '1': |
|
|
289 | dx = 0; |
|
|
290 | dy = -1; |
|
|
291 | map = map->xy_find (dx, dy); |
|
|
292 | map && (mapy -= map->height); |
|
|
293 | break; |
|
|
294 | case '2': |
|
|
295 | mapx += map->width; |
|
|
296 | dx = map->width; |
|
|
297 | dy = 0; |
|
|
298 | map = map->xy_find (dx, dy); |
|
|
299 | break; |
|
|
300 | case '3': |
|
|
301 | mapy += map->height; |
|
|
302 | dx = 0; |
|
|
303 | dy = map->height; |
|
|
304 | map = map->xy_find (dx, dy); |
|
|
305 | break; |
|
|
306 | case '4': |
|
|
307 | dx = -1; |
|
|
308 | dy = 0; |
|
|
309 | map = map->xy_find (dx, dy); |
|
|
310 | map && (mapx -= map->width); |
|
|
311 | break; |
|
|
312 | } |
|
|
313 | |
|
|
314 | --max_distance; |
|
|
315 | } |
|
|
316 | |
|
|
317 | if (!max_distance) |
|
|
318 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
|
|
319 | else if (map && map->path[0]) |
|
|
320 | { |
|
|
321 | int flags = 0; |
|
|
322 | |
|
|
323 | if (map->tile_path[0]) flags |= 1; |
|
|
324 | if (map->tile_path[1]) flags |= 2; |
|
|
325 | if (map->tile_path[2]) flags |= 4; |
|
|
326 | if (map->tile_path[3]) flags |= 8; |
|
|
327 | |
|
|
328 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
329 | } |
|
|
330 | else |
358 | else |
331 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
359 | #endif |
|
|
360 | pl->ns->mapinfo_queue.push_back (copy); |
332 | } |
361 | } |
333 | else |
362 | else |
334 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
363 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
335 | |
|
|
336 | pl->ns->send_packet (bigbuf); |
|
|
337 | } |
364 | } |
338 | |
365 | |
339 | /** This is the Setup cmd */ |
366 | /** This is the Setup cmd */ |
340 | void |
367 | void |
341 | SetUp (char *buf, int len, client * ns) |
368 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
937 | |
964 | |
938 | if (!ns.faces_sent[face_num]) |
965 | if (!ns.faces_sent[face_num]) |
939 | if (ob) |
966 | if (ob) |
940 | ns.send_faces (ob); |
967 | ns.send_faces (ob); |
941 | else |
968 | else |
942 | ns.send_face (face_num); |
969 | ns.send_face (face_num, 10); |
943 | |
970 | |
944 | sl << uint16 (face_num); |
971 | sl << uint16 (face_num); |
945 | return 1; |
972 | return 1; |
946 | } |
973 | } |
947 | |
974 | |
… | |
… | |
1004 | |
1031 | |
1005 | /* If player is just joining the game, he isn't here yet, so the map |
1032 | /* If player is just joining the game, he isn't here yet, so the map |
1006 | * can get swapped out. If so, don't try to send them a map. All will |
1033 | * can get swapped out. If so, don't try to send them a map. All will |
1007 | * be OK once they really log in. |
1034 | * be OK once they really log in. |
1008 | */ |
1035 | */ |
1009 | if (!plmap || plmap->in_memory != MAP_IN_MEMORY) |
1036 | if (!plmap || plmap->in_memory != MAP_ACTIVE) |
1010 | return; |
1037 | return; |
1011 | |
1038 | |
1012 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1039 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1013 | int estartlen, eoldlen; |
1040 | int estartlen, eoldlen; |
1014 | uint8 eentrysize; |
1041 | uint8 eentrysize; |
… | |
… | |
1102 | |
1129 | |
1103 | if (!m) |
1130 | if (!m) |
1104 | { |
1131 | { |
1105 | nx = x; ny = y; m = plmap; |
1132 | nx = x; ny = y; m = plmap; |
1106 | |
1133 | |
1107 | if (!xy_normalise (m, nx, ny)) |
1134 | if (xy_normalise (m, nx, ny)) |
|
|
1135 | m->touch (); |
|
|
1136 | else |
1108 | m = 0; |
1137 | m = 0; |
1109 | } |
1138 | } |
1110 | |
1139 | |
1111 | int emask, mask; |
1140 | int emask, mask; |
1112 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1141 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
… | |
… | |
1129 | } |
1158 | } |
1130 | |
1159 | |
1131 | continue; |
1160 | continue; |
1132 | } |
1161 | } |
1133 | |
1162 | |
1134 | m->touch (); |
|
|
1135 | |
|
|
1136 | int d = pl->blocked_los[ax][ay]; |
1163 | int d = pl->blocked_los[ax][ay]; |
1137 | |
1164 | |
1138 | if (d > 3) |
1165 | if (d > 3) |
1139 | { |
1166 | { |
1140 | |
1167 | |
… | |
… | |
1215 | uint8 flags = 0; |
1242 | uint8 flags = 0; |
1216 | tag_t player = 0; |
1243 | tag_t player = 0; |
1217 | |
1244 | |
1218 | // send hp information, if applicable |
1245 | // send hp information, if applicable |
1219 | if (object *op = ms.faces_obj [0]) |
1246 | if (object *op = ms.faces_obj [0]) |
|
|
1247 | if (op->is_head () && !op->invisible) |
1220 | { |
1248 | { |
1221 | if (op->head || op->invisible) |
1249 | if (op->stats.maxhp > op->stats.hp |
1222 | ; // do not show |
1250 | && op->stats.maxhp > 0 |
1223 | else if (op->type == PLAYER |
1251 | && (op->type == PLAYER |
|
|
1252 | || op->type == DOOR // does not work, have maxhp 0 |
1224 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1253 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))) |
1225 | { |
|
|
1226 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
|
|
1227 | { |
1254 | { |
1228 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1255 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1229 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1256 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1230 | } |
1257 | } |
1231 | } |
|
|
1232 | |
1258 | |
1233 | if (op->msg && op->msg[0] == '@') |
1259 | if (op->msg && op->msg[0] == '@') |
1234 | flags |= 1; |
1260 | flags |= 1; |
1235 | |
1261 | |
1236 | if (op->type == PLAYER && op != ob) |
1262 | if (op->type == PLAYER && op != ob) |
1237 | player = op->count; |
1263 | player = op->count; |
1238 | } |
1264 | } |
1239 | |
1265 | |
1240 | if (lastcell.stat_hp != stat_hp) |
1266 | if (lastcell.stat_hp != stat_hp) |
1241 | { |
1267 | { |
1242 | lastcell.stat_hp = stat_hp; |
1268 | lastcell.stat_hp = stat_hp; |
1243 | |
1269 | |
… | |
… | |
1394 | sl << "replyinfo skill_info\n"; |
1420 | sl << "replyinfo skill_info\n"; |
1395 | |
1421 | |
1396 | for (int i = 1; i < NUM_SKILLS; i++) |
1422 | for (int i = 1; i < NUM_SKILLS; i++) |
1397 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1423 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1398 | |
1424 | |
1399 | if (sl.length () >= MAXSOCKBUF) |
1425 | if (sl.length () > MAXSOCKBUF) |
1400 | { |
1426 | { |
1401 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1427 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1402 | fatal (0); |
1428 | fatal (0); |
1403 | } |
1429 | } |
1404 | |
1430 | |
… | |
… | |
1417 | sl << "replyinfo spell_paths\n"; |
1443 | sl << "replyinfo spell_paths\n"; |
1418 | |
1444 | |
1419 | for (int i = 0; i < NRSPELLPATHS; i++) |
1445 | for (int i = 0; i < NRSPELLPATHS; i++) |
1420 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1446 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1421 | |
1447 | |
1422 | if (sl.length () >= MAXSOCKBUF) |
1448 | if (sl.length () > MAXSOCKBUF) |
1423 | { |
1449 | { |
1424 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1450 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1425 | fatal (0); |
1451 | fatal (0); |
1426 | } |
1452 | } |
1427 | |
1453 | |
… | |
… | |
1535 | if (!spell->face) |
1561 | if (!spell->face) |
1536 | { |
1562 | { |
1537 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1563 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1538 | spell->face = face_find ("burnout.x11", blank_face); |
1564 | spell->face = face_find ("burnout.x11", blank_face); |
1539 | } |
1565 | } |
|
|
1566 | |
|
|
1567 | pl->ns->send_face (spell->face); |
1540 | |
1568 | |
1541 | /* send the current values */ |
1569 | /* send the current values */ |
1542 | sl << uint32 (spell->count) |
1570 | sl << uint32 (spell->count) |
1543 | << uint16 (spell->level) |
1571 | << uint16 (spell->level) |
1544 | << uint16 (spell->casting_time) |
1572 | << uint16 (spell->casting_time) |
… | |
… | |
1580 | * bytes and 3 strings (because that is the spec) so we need to |
1608 | * bytes and 3 strings (because that is the spec) so we need to |
1581 | * check that the length of those 3 strings, plus the 23 bytes, |
1609 | * check that the length of those 3 strings, plus the 23 bytes, |
1582 | * won't take us over the length limit for the socket, if it does, |
1610 | * won't take us over the length limit for the socket, if it does, |
1583 | * we need to send what we already have, and restart packet formation |
1611 | * we need to send what we already have, and restart packet formation |
1584 | */ |
1612 | */ |
|
|
1613 | if (spell->type != SPELL) |
|
|
1614 | continue; |
|
|
1615 | |
1585 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1616 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1586 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1617 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1587 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1618 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1588 | * like it will fix this |
1619 | * like it will fix this |
1589 | */ |
1620 | */ |
1590 | if (spell->type != SPELL) |
|
|
1591 | continue; |
|
|
1592 | |
|
|
1593 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1621 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1594 | { |
1622 | { |
|
|
1623 | pl->ns->flush_fx (); |
1595 | pl->ns->send_packet (sl); |
1624 | pl->ns->send_packet (sl); |
1596 | |
1625 | |
1597 | sl.reset (); |
1626 | sl.reset (); |
1598 | sl << "addspell "; |
1627 | sl << "addspell "; |
1599 | } |
1628 | } |
… | |
… | |
1607 | return; |
1636 | return; |
1608 | } |
1637 | } |
1609 | else |
1638 | else |
1610 | append_spell (pl, sl, spell); |
1639 | append_spell (pl, sl, spell); |
1611 | |
1640 | |
1612 | if (sl.length () >= MAXSOCKBUF) |
1641 | if (sl.length () > MAXSOCKBUF) |
1613 | { |
1642 | { |
1614 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1643 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1615 | fatal (0); |
1644 | fatal (0); |
1616 | } |
1645 | } |
1617 | |
1646 | |
1618 | /* finally, we can send the packet */ |
1647 | /* finally, we can send the packet */ |
|
|
1648 | pl->ns->flush_fx (); |
1619 | pl->ns->send_packet (sl); |
1649 | pl->ns->send_packet (sl); |
1620 | } |
1650 | } |
1621 | |
1651 | |