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) |
… | |
… | |
145 | /** check for map/region change and send new map data */ |
146 | /** check for map/region change and send new map data */ |
146 | static void |
147 | static void |
147 | check_map_change (player *pl) |
148 | check_map_change (player *pl) |
148 | { |
149 | { |
149 | client &socket = *pl->ns; |
150 | client &socket = *pl->ns; |
150 | object *ob = pl->ob; |
151 | object *ob = pl->observe; |
151 | char buf[MAX_BUF]; /* eauugggh */ |
|
|
152 | |
152 | |
153 | if (socket.current_map != ob->map || socket.force_newmap) |
153 | if (socket.current_map != ob->map || socket.force_newmap) |
154 | { |
154 | { |
155 | clear_map (pl); |
155 | clear_map (pl); |
156 | socket.current_map = ob->map; |
156 | socket.current_map = ob->map; |
… | |
… | |
164 | if (ob->map->tile_path[0]) flags |= 1; |
164 | if (ob->map->tile_path[0]) flags |= 1; |
165 | if (ob->map->tile_path[1]) flags |= 2; |
165 | if (ob->map->tile_path[1]) flags |= 2; |
166 | if (ob->map->tile_path[2]) flags |= 4; |
166 | if (ob->map->tile_path[2]) flags |= 4; |
167 | if (ob->map->tile_path[3]) flags |= 8; |
167 | if (ob->map->tile_path[3]) flags |= 8; |
168 | |
168 | |
169 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
169 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
170 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
170 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
171 | ob->map->width, ob->map->height, &ob->map->path); |
171 | } |
172 | } |
172 | else |
173 | else |
173 | snprintf (buf, MAX_BUF, "mapinfo current"); |
|
|
174 | |
|
|
175 | socket.send_packet (buf); |
174 | socket.send_packet ("mapinfo current"); |
176 | } |
175 | } |
177 | } |
176 | } |
178 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
177 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
179 | { |
178 | { |
180 | int dx = ob->x - socket.current_x; |
179 | int dx = ob->x - socket.current_x; |
… | |
… | |
193 | socket.current_y = ob->y; |
192 | socket.current_y = ob->y; |
194 | |
193 | |
195 | region *reg = ob->region (); |
194 | region *reg = ob->region (); |
196 | if (socket.current_region != reg) |
195 | if (socket.current_region != reg) |
197 | { |
196 | { |
|
|
197 | INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); |
198 | socket.current_region = reg; |
198 | socket.current_region = reg; |
199 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
200 | } |
199 | } |
201 | } |
200 | } |
202 | |
201 | |
203 | /** |
202 | /** |
204 | * RequestInfo is sort of a meta command. There is some specific |
203 | * RequestInfo is sort of a meta command. There is some specific |
205 | * request of information, but we call other functions to provide |
204 | * request of information, but we call other functions to provide |
206 | * that information. |
205 | * that information. |
207 | */ |
206 | */ |
208 | void |
207 | void |
209 | RequestInfo (char *buf, int len, client * ns) |
208 | RequestInfo (char *buf, int len, client *ns) |
210 | { |
209 | { |
211 | char *params = NULL, *cp; |
210 | char *params; |
212 | |
|
|
213 | /* No match */ |
|
|
214 | char bigbuf[MAX_BUF]; |
|
|
215 | int slen; |
|
|
216 | |
|
|
217 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
218 | * if we don't find a match. |
|
|
219 | */ |
|
|
220 | strcpy (bigbuf, "replyinfo "); |
|
|
221 | slen = strlen (bigbuf); |
|
|
222 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
223 | |
211 | |
224 | /* find the first space, make it null, and update the |
212 | /* find the first space, make it null, and update the |
225 | * params pointer. |
213 | * params pointer. |
226 | */ |
214 | */ |
227 | for (cp = buf; *cp != '\0'; cp++) |
215 | for (params = buf; *params; params++) |
228 | if (*cp == ' ') |
216 | if (*params == ' ') |
229 | { |
217 | { |
230 | *cp = '\0'; |
|
|
231 | params = cp + 1; |
218 | *params++ = 0; |
232 | break; |
219 | break; |
233 | } |
220 | } |
234 | |
221 | |
235 | if (!strcmp (buf, "image_info")) |
222 | if (!strcmp (buf, "image_info")) |
236 | send_image_info (ns, params); |
223 | send_image_info (ns, params); |
… | |
… | |
239 | else if (!strcmp (buf, "skill_info")) |
226 | else if (!strcmp (buf, "skill_info")) |
240 | send_skill_info (ns, params); |
227 | send_skill_info (ns, params); |
241 | else if (!strcmp (buf, "spell_paths")) |
228 | else if (!strcmp (buf, "spell_paths")) |
242 | send_spell_paths (ns, params); |
229 | send_spell_paths (ns, params); |
243 | else |
230 | else |
244 | 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 | } |
245 | } |
238 | } |
246 | |
239 | |
247 | void |
240 | void |
248 | ExtCmd (char *buf, int len, player *pl) |
241 | ExtCmd (char *buf, int len, player *pl) |
249 | { |
242 | { |
… | |
… | |
252 | |
245 | |
253 | void |
246 | void |
254 | ExtiCmd (char *buf, int len, client *ns) |
247 | ExtiCmd (char *buf, int len, client *ns) |
255 | { |
248 | { |
256 | 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; |
257 | } |
336 | } |
258 | |
337 | |
259 | void |
338 | void |
260 | MapInfoCmd (char *buf, int len, player *pl) |
339 | MapInfoCmd (char *buf, int len, player *pl) |
261 | { |
340 | { |
262 | // <mapinfo tag spatial tile-path |
341 | // <mapinfo tag spatial tile-path |
263 | // >mapinfo tag spatial flags x y w h hash |
342 | // >mapinfo tag spatial flags x y w h hash |
264 | |
343 | |
265 | char bigbuf[MAX_BUF], *token; |
|
|
266 | |
|
|
267 | token = buf; |
344 | char *token = buf; |
268 | // copy token |
345 | |
269 | if (!(buf = strchr (buf, ' '))) |
346 | if (!(buf = strchr (buf, ' '))) |
270 | return; |
347 | return; |
271 | |
348 | |
272 | *buf++ = 0; |
|
|
273 | |
|
|
274 | if (!strncmp (buf, "spatial ", 8)) |
349 | if (!strncmp (buf, " spatial ", 9)) |
275 | { |
350 | { |
276 | buf += 8; |
351 | char *copy = strdup (token); |
|
|
352 | copy [buf - token] = 0; |
277 | |
353 | |
278 | // initial map and its origin |
354 | #if 0 |
279 | maptile *map = pl->ob->map; |
355 | // this makes only sense when we flush the buffer immediately |
280 | sint16 dx, dy; |
356 | if (pl->ns->mapinfo_try (copy)) |
281 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
357 | free (copy); |
282 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
|
|
283 | int max_distance = 8; // limit maximum path length to something generous |
|
|
284 | |
|
|
285 | while (*buf && map && max_distance) |
|
|
286 | { |
|
|
287 | int dir = *buf++; |
|
|
288 | |
|
|
289 | switch (dir) |
|
|
290 | { |
|
|
291 | case '1': |
|
|
292 | dx = 0; |
|
|
293 | dy = -1; |
|
|
294 | map = map->xy_find (dx, dy); |
|
|
295 | map && (mapy -= map->height); |
|
|
296 | break; |
|
|
297 | case '2': |
|
|
298 | mapx += map->width; |
|
|
299 | dx = map->width; |
|
|
300 | dy = 0; |
|
|
301 | map = map->xy_find (dx, dy); |
|
|
302 | break; |
|
|
303 | case '3': |
|
|
304 | mapy += map->height; |
|
|
305 | dx = 0; |
|
|
306 | dy = map->height; |
|
|
307 | map = map->xy_find (dx, dy); |
|
|
308 | break; |
|
|
309 | case '4': |
|
|
310 | dx = -1; |
|
|
311 | dy = 0; |
|
|
312 | map = map->xy_find (dx, dy); |
|
|
313 | map && (mapx -= map->width); |
|
|
314 | break; |
|
|
315 | } |
|
|
316 | |
|
|
317 | --max_distance; |
|
|
318 | } |
|
|
319 | |
|
|
320 | if (!max_distance) |
|
|
321 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
|
|
322 | else if (map && map->path[0]) |
|
|
323 | { |
|
|
324 | int flags = 0; |
|
|
325 | |
|
|
326 | if (map->tile_path[0]) flags |= 1; |
|
|
327 | if (map->tile_path[1]) flags |= 2; |
|
|
328 | if (map->tile_path[2]) flags |= 4; |
|
|
329 | if (map->tile_path[3]) flags |= 8; |
|
|
330 | |
|
|
331 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
332 | } |
|
|
333 | else |
358 | else |
334 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
359 | #endif |
|
|
360 | pl->ns->mapinfo_queue.push_back (copy); |
335 | } |
361 | } |
336 | else |
362 | else |
337 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
363 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
338 | |
|
|
339 | pl->ns->send_packet (bigbuf); |
|
|
340 | } |
364 | } |
341 | |
365 | |
342 | /** This is the Setup cmd */ |
366 | /** This is the Setup cmd */ |
343 | void |
367 | void |
344 | SetUp (char *buf, int len, client * ns) |
368 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
473 | |
497 | |
474 | ns->send_packet (cmdback); |
498 | ns->send_packet (cmdback); |
475 | } |
499 | } |
476 | |
500 | |
477 | /** |
501 | /** |
478 | * client requested an image. send it rate-limited |
|
|
479 | * before flushing. |
|
|
480 | */ |
|
|
481 | void |
|
|
482 | AskFaceCmd (char *buf, int len, client *ns) |
|
|
483 | { |
|
|
484 | ns->askface.push_back (atoi (buf)); |
|
|
485 | } |
|
|
486 | |
|
|
487 | /** |
|
|
488 | * Tells client the picture it has to use |
|
|
489 | * to smooth a picture number given as argument. |
|
|
490 | */ |
|
|
491 | void |
|
|
492 | AskSmooth (char *buf, int len, client *ns) |
|
|
493 | { |
|
|
494 | ns->send_face (atoi (buf)); |
|
|
495 | ns->flush_fx (); |
|
|
496 | } |
|
|
497 | |
|
|
498 | /** |
|
|
499 | * This handles the general commands from the client (ie, north, fire, cast, |
502 | * This handles the general commands from the client (ie, north, fire, cast, |
500 | * etc.) |
503 | * etc.) |
501 | */ |
504 | */ |
502 | void |
505 | void |
503 | PlayerCmd (char *buf, int len, player *pl) |
506 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
524 | * commands. |
527 | * commands. |
525 | */ |
528 | */ |
526 | pl->count = 0; |
529 | pl->count = 0; |
527 | } |
530 | } |
528 | |
531 | |
529 | |
|
|
530 | /** |
532 | /** |
531 | * This handles the general commands from the client (ie, north, fire, cast, |
533 | * This handles the general commands from the client (ie, north, fire, cast, |
532 | * etc.). It is a lot like PlayerCmd above, but is called with the |
534 | * etc.). It is a lot like PlayerCmd above, but is called with the |
533 | * 'ncom' method which gives more information back to the client so it |
535 | * 'ncom' method which gives more information back to the client so it |
534 | * can throttle. |
536 | * can throttle. |
… | |
… | |
536 | void |
538 | void |
537 | NewPlayerCmd (char *buf, int len, player *pl) |
539 | NewPlayerCmd (char *buf, int len, player *pl) |
538 | { |
540 | { |
539 | if (len <= 6) |
541 | if (len <= 6) |
540 | { |
542 | { |
541 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
543 | LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); |
542 | return; |
544 | return; |
543 | } |
545 | } |
544 | |
546 | |
545 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
547 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
546 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
548 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
… | |
… | |
740 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
742 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
741 | |
743 | |
742 | if (pl->combat_ob) |
744 | if (pl->combat_ob) |
743 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
745 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
744 | |
746 | |
|
|
747 | #if 0 |
745 | //TODO: remove this when slot system is working, this is only for debugging |
748 | //TODO: remove this when slot system is working, this is only for debugging |
746 | if (pl->ob->chosen_skill) |
749 | if (pl->ob->chosen_skill) |
747 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
750 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
751 | #endif |
748 | |
752 | |
749 | //TODO: maybe golem should become the current_weapon, quite simply? |
753 | //TODO: maybe golem should become the current_weapon, quite simply? |
750 | if (pl->golem) |
754 | if (pl->golem) |
751 | buf << " Golem*: " << pl->golem->name; |
755 | buf << " Golem*: " << pl->golem->name; |
752 | |
756 | |
|
|
757 | buf << '\0'; |
753 | buf.linearise (obuf); |
758 | buf.linearise (obuf); |
754 | obuf [buf.size ()] = 0; |
|
|
755 | } |
759 | } |
756 | |
760 | |
757 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
761 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
758 | Old = New; \ |
762 | Old = New; \ |
759 | sl << uint8 (Type) << uint64 (New); \ |
763 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
793 | |
797 | |
794 | client *ns = pl->ns; |
798 | client *ns = pl->ns; |
795 | if (!ns) |
799 | if (!ns) |
796 | return; |
800 | return; |
797 | |
801 | |
798 | object *ob = pl->ob; |
802 | object *ob = pl->observe; |
799 | if (!ob) |
803 | if (!ob) |
800 | return; |
804 | return; |
|
|
805 | |
|
|
806 | player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl; |
801 | |
807 | |
802 | packet sl ("stats"); |
808 | packet sl ("stats"); |
803 | |
809 | |
804 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
810 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
805 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
811 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
814 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
820 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
815 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
821 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
816 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
822 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
817 | |
823 | |
818 | for (int s = 0; s < NUM_SKILLS; s++) |
824 | for (int s = 0; s < NUM_SKILLS; s++) |
819 | if (object *skill = pl->last_skill_ob[s]) |
825 | if (object *skill = opl->last_skill_ob[s]) |
820 | if (skill->stats.exp != ns->last_skill_exp [s]) |
826 | if (skill->stats.exp != ns->last_skill_exp [s]) |
821 | { |
827 | { |
822 | ns->last_skill_exp [s] = skill->stats.exp; |
828 | ns->last_skill_exp [s] = skill->stats.exp; |
823 | |
829 | |
824 | /* Always send along the level if exp changes. This is only |
830 | /* Always send along the level if exp changes. This is only |
… | |
… | |
839 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
845 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
840 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
846 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
841 | |
847 | |
842 | flags = 0; |
848 | flags = 0; |
843 | |
849 | |
844 | if (pl->fire_on) |
850 | if (opl->fire_on) |
845 | flags |= SF_FIREON; |
851 | flags |= SF_FIREON; |
846 | |
852 | |
847 | if (pl->run_on) |
853 | if (opl->run_on) |
848 | flags |= SF_RUNON; |
854 | flags |= SF_RUNON; |
849 | |
855 | |
850 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
856 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
851 | |
857 | |
852 | if (ns->sc_version < 1025) |
858 | if (ns->sc_version < 1025) |
… | |
… | |
866 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
872 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
867 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
873 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
868 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
874 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
869 | } |
875 | } |
870 | |
876 | |
871 | rangetostring (pl, buf); /* we want use the new fire & run system in new client */ |
877 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
872 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
878 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
873 | set_title (ob, buf); |
879 | set_title (ob, buf); |
874 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
880 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
875 | |
881 | |
876 | /* Only send it away if we have some actual data */ |
882 | /* Only send it away if we have some actual data */ |
… | |
… | |
880 | |
886 | |
881 | /** |
887 | /** |
882 | * Tells the client that here is a player it should start using. |
888 | * Tells the client that here is a player it should start using. |
883 | */ |
889 | */ |
884 | void |
890 | void |
885 | esrv_new_player (player *pl, uint32 weight) |
891 | esrv_new_player (player *pl) |
886 | { |
892 | { |
|
|
893 | sint32 weight = pl->ob->client_weight (); |
|
|
894 | |
887 | packet sl ("player"); |
895 | packet sl ("player"); |
888 | |
896 | |
889 | sl << uint32 (pl->ob->count) |
897 | sl << uint32 (pl->ob->count) |
890 | << uint32 (weight) |
898 | << uint32 (weight) |
891 | << uint32 (pl->ob->face) |
899 | << uint32 (pl->ob->face) |
… | |
… | |
958 | |
966 | |
959 | if (!ns.faces_sent[face_num]) |
967 | if (!ns.faces_sent[face_num]) |
960 | if (ob) |
968 | if (ob) |
961 | ns.send_faces (ob); |
969 | ns.send_faces (ob); |
962 | else |
970 | else |
963 | ns.send_face (face_num); |
971 | ns.send_face (face_num, 10); |
964 | |
972 | |
965 | sl << uint16 (face_num); |
973 | sl << uint16 (face_num); |
966 | return 1; |
974 | return 1; |
967 | } |
975 | } |
968 | |
976 | |
… | |
… | |
1010 | { |
1018 | { |
1011 | prefetch_surrounding_maps (op->map, 3); |
1019 | prefetch_surrounding_maps (op->map, 3); |
1012 | } |
1020 | } |
1013 | |
1021 | |
1014 | /** |
1022 | /** |
1015 | * This function uses the new map1 protocol command to send the map |
1023 | * Draws client map. |
1016 | * to the client. It is necessary because the old map command supports |
|
|
1017 | * a maximum map size of 15x15. |
|
|
1018 | * This function is much simpler than the old one. This is because |
|
|
1019 | * the old function optimized to send as few face identifiers as possible, |
|
|
1020 | * at the expense of sending more coordinate location (coordinates were |
|
|
1021 | * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since |
|
|
1022 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
|
|
1023 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
|
|
1024 | * and use the other 4 bits for other informatiion. For full documentation |
|
|
1025 | * of what we send, see the doc/Protocol file. |
|
|
1026 | * I will describe internally what we do: |
|
|
1027 | * the ns->lastmap shows how the map last looked when sent to the client. |
|
|
1028 | * in the lastmap structure, there is a cells array, which is set to the |
|
|
1029 | * maximum viewable size (As set in config.h). |
|
|
1030 | * in the cells, there are faces and a count value. |
|
|
1031 | * we use the count value to hold the darkness value. If -1, then this space |
|
|
1032 | * is not viewable. |
|
|
1033 | * we use faces[0] faces[1] faces[2] to hold what the three layers |
|
|
1034 | * look like. |
|
|
1035 | */ |
1024 | */ |
1036 | void |
1025 | void |
1037 | draw_client_map1 (object *pl) |
1026 | draw_client_map (player *pl) |
1038 | { |
1027 | { |
|
|
1028 | object *ob = pl->observe; |
|
|
1029 | if (!ob->active) |
|
|
1030 | return; |
|
|
1031 | |
|
|
1032 | maptile *plmap = ob->map; |
|
|
1033 | |
|
|
1034 | /* If player is just joining the game, he isn't here yet, so the map |
|
|
1035 | * can get swapped out. If so, don't try to send them a map. All will |
|
|
1036 | * be OK once they really log in. |
|
|
1037 | */ |
|
|
1038 | if (!plmap || plmap->in_memory != MAP_ACTIVE) |
|
|
1039 | return; |
|
|
1040 | |
1039 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1041 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1040 | sint16 nx, ny; |
|
|
1041 | int estartlen, eoldlen; |
1042 | int estartlen, eoldlen; |
1042 | uint8 eentrysize; |
1043 | uint8 eentrysize; |
1043 | uint16 ewhatstart, ewhatflag; |
1044 | uint16 ewhatstart, ewhatflag; |
1044 | uint8 extendedinfos; |
1045 | uint8 extendedinfos; |
1045 | maptile *m; |
|
|
1046 | |
1046 | |
1047 | client &socket = *pl->contr->ns; |
|
|
1048 | |
|
|
1049 | if (!pl->active) |
|
|
1050 | return; |
|
|
1051 | |
|
|
1052 | check_map_change (pl->contr); |
1047 | check_map_change (pl); |
1053 | prefetch_surrounding_maps (pl); |
1048 | prefetch_surrounding_maps (pl->ob); |
|
|
1049 | |
|
|
1050 | /* do LOS after calls to update_position */ |
|
|
1051 | if (ob != pl->ob) |
|
|
1052 | clear_los (pl); |
|
|
1053 | else if (pl->do_los) |
|
|
1054 | { |
|
|
1055 | update_los (ob); |
|
|
1056 | pl->do_los = 0; |
|
|
1057 | } |
|
|
1058 | |
|
|
1059 | /** |
|
|
1060 | * This function uses the new map1 protocol command to send the map |
|
|
1061 | * to the client. It is necessary because the old map command supports |
|
|
1062 | * a maximum map size of 15x15. |
|
|
1063 | * This function is much simpler than the old one. This is because |
|
|
1064 | * the old function optimized to send as few face identifiers as possible, |
|
|
1065 | * at the expense of sending more coordinate location (coordinates were |
|
|
1066 | * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since |
|
|
1067 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
|
|
1068 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
|
|
1069 | * and use the other 4 bits for other informatiion. For full documentation |
|
|
1070 | * of what we send, see the doc/Protocol file. |
|
|
1071 | * I will describe internally what we do: |
|
|
1072 | * the ns->lastmap shows how the map last looked when sent to the client. |
|
|
1073 | * in the lastmap structure, there is a cells array, which is set to the |
|
|
1074 | * maximum viewable size (As set in config.h). |
|
|
1075 | * in the cells, there are faces and a count value. |
|
|
1076 | * we use the count value to hold the darkness value. If -1, then this space |
|
|
1077 | * is not viewable. |
|
|
1078 | * we use faces[0] faces[1] faces[2] to hold what the three layers |
|
|
1079 | * look like. |
|
|
1080 | */ |
|
|
1081 | |
|
|
1082 | client &socket = *pl->ns; |
1054 | |
1083 | |
1055 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1084 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1056 | packet esl; |
1085 | packet esl; |
1057 | |
1086 | |
1058 | startlen = sl.length (); |
1087 | startlen = sl.length (); |
… | |
… | |
1082 | ay = 0; |
1111 | ay = 0; |
1083 | |
1112 | |
1084 | /* We could do this logic as conditionals in the if statement, |
1113 | /* We could do this logic as conditionals in the if statement, |
1085 | * but that started to get a bit messy to look at. |
1114 | * but that started to get a bit messy to look at. |
1086 | */ |
1115 | */ |
1087 | max_x = pl->x + (socket.mapx + 1) / 2; |
1116 | max_x = ob->x + (socket.mapx + 1) / 2; |
1088 | max_y = pl->y + (socket.mapy + 1) / 2; |
1117 | max_y = ob->y + (socket.mapy + 1) / 2; |
1089 | |
1118 | |
1090 | maptile *plmap = pl->map; |
|
|
1091 | |
|
|
1092 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1119 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1093 | { |
1120 | { |
|
|
1121 | sint16 nx, ny; |
|
|
1122 | maptile *m = 0; |
|
|
1123 | |
1094 | ax = 0; |
1124 | ax = 0; |
1095 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1125 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1096 | { |
1126 | { |
|
|
1127 | // check to see if we can simply go one right quickly |
|
|
1128 | ++nx; |
|
|
1129 | if (m && nx >= m->width) |
|
|
1130 | m = 0; |
|
|
1131 | |
|
|
1132 | if (!m) |
|
|
1133 | { |
|
|
1134 | nx = x; ny = y; m = plmap; |
|
|
1135 | |
|
|
1136 | if (xy_normalise (m, nx, ny)) |
|
|
1137 | m->touch (); |
|
|
1138 | else |
|
|
1139 | m = 0; |
|
|
1140 | } |
|
|
1141 | |
1097 | int emask, mask; |
1142 | int emask, mask; |
1098 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1143 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1099 | |
1144 | |
1100 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1145 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1101 | |
1146 | |
1102 | /* If the coordinates are not valid, or it is too dark to see, |
1147 | /* If the coordinates are not valid, or it is too dark to see, |
1103 | * we tell the client as such |
1148 | * we tell the client as such |
1104 | */ |
1149 | */ |
1105 | nx = x; |
|
|
1106 | ny = y; |
|
|
1107 | m = get_map_from_coord (plmap, &nx, &ny); |
|
|
1108 | |
|
|
1109 | if (!m) |
1150 | if (!m) |
1110 | { |
1151 | { |
1111 | /* space is out of map. Update space and clear values |
1152 | /* space is out of map. Update space and clear values |
1112 | * if this hasn't already been done. If the space is out |
1153 | * if this hasn't already been done. If the space is out |
1113 | * of the map, it shouldn't have a head |
1154 | * of the map, it shouldn't have a head |
… | |
… | |
1119 | } |
1160 | } |
1120 | |
1161 | |
1121 | continue; |
1162 | continue; |
1122 | } |
1163 | } |
1123 | |
1164 | |
1124 | m->touch (); |
|
|
1125 | |
|
|
1126 | int d = pl->contr->blocked_los[ax][ay]; |
1165 | int d = pl->blocked_los[ax][ay]; |
1127 | |
1166 | |
1128 | if (d > 3) |
1167 | if (d > 3) |
1129 | { |
1168 | { |
1130 | |
1169 | |
1131 | int need_send = 0, count; |
1170 | int need_send = 0, count; |
… | |
… | |
1194 | } |
1233 | } |
1195 | |
1234 | |
1196 | lastcell.count = d; |
1235 | lastcell.count = d; |
1197 | |
1236 | |
1198 | mapspace &ms = m->at (nx, ny); |
1237 | mapspace &ms = m->at (nx, ny); |
|
|
1238 | ms.update (); |
1199 | |
1239 | |
1200 | if (socket.extmap) |
1240 | if (socket.extmap) |
1201 | { |
1241 | { |
1202 | uint8 stat_hp = 0; |
1242 | uint8 stat_hp = 0; |
1203 | uint8 stat_width = 0; |
1243 | uint8 stat_width = 0; |
1204 | uint8 flags = 0; |
1244 | uint8 flags = 0; |
1205 | tag_t player = 0; |
1245 | tag_t player = 0; |
1206 | |
1246 | |
1207 | // send hp information, if applicable |
1247 | // send hp information, if applicable |
1208 | if (object *op = ms.faces_obj [0]) |
1248 | if (object *op = ms.faces_obj [0]) |
|
|
1249 | if (op->is_head () && !op->invisible) |
1209 | { |
1250 | { |
1210 | if (op->head || op->invisible) |
1251 | if (op->stats.maxhp > op->stats.hp |
1211 | ; // do not show |
1252 | && op->stats.maxhp > 0 |
1212 | else if (op->type == PLAYER |
1253 | && (op->type == PLAYER |
|
|
1254 | || op->type == DOOR // does not work, have maxhp 0 |
1213 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1255 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))) |
1214 | { |
|
|
1215 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
|
|
1216 | { |
1256 | { |
1217 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1257 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1218 | stat_width = op->arch->tail_x; |
1258 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1219 | } |
1259 | } |
1220 | } |
|
|
1221 | |
1260 | |
1222 | if (op->msg && op->msg[0] == '@') |
1261 | if (op->msg && op->msg[0] == '@') |
1223 | flags |= 1; |
1262 | flags |= 1; |
1224 | |
1263 | |
1225 | if (op->type == PLAYER && op != pl) |
1264 | if (op->type == PLAYER && op != ob) |
1226 | player = op->count; |
1265 | player = op->count; |
1227 | } |
1266 | } |
1228 | |
1267 | |
1229 | if (lastcell.stat_hp != stat_hp) |
1268 | if (lastcell.stat_hp != stat_hp) |
1230 | { |
1269 | { |
1231 | lastcell.stat_hp = stat_hp; |
1270 | lastcell.stat_hp = stat_hp; |
1232 | |
1271 | |
… | |
… | |
1274 | |
1313 | |
1275 | /* Middle face */ |
1314 | /* Middle face */ |
1276 | if (update_space (sl, socket, ms, lastcell, 1)) |
1315 | if (update_space (sl, socket, ms, lastcell, 1)) |
1277 | mask |= 0x2; |
1316 | mask |= 0x2; |
1278 | |
1317 | |
1279 | if (ms.player () == pl |
1318 | if (ms.player () == ob |
1280 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
1319 | && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) |
1281 | { |
1320 | { |
1282 | // force player to be visible to himself if invisible |
1321 | // force player to be visible to himself if invisible |
1283 | if (lastcell.faces[0] != pl->face) |
1322 | if (lastcell.faces[0] != ob->face) |
1284 | { |
1323 | { |
1285 | lastcell.faces[0] = pl->face; |
1324 | lastcell.faces[0] = ob->face; |
1286 | |
1325 | |
1287 | mask |= 0x1; |
1326 | mask |= 0x1; |
1288 | sl << uint16 (pl->face); |
1327 | sl << uint16 (ob->face); |
1289 | |
1328 | |
1290 | socket.send_faces (pl); |
1329 | socket.send_faces (ob); |
1291 | } |
1330 | } |
1292 | } |
1331 | } |
1293 | /* Top face */ |
1332 | /* Top face */ |
1294 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1333 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1295 | mask |= 0x1; |
1334 | mask |= 0x1; |
1296 | |
|
|
1297 | |
1335 | |
1298 | /* Check to see if we are in fact sending anything for this |
1336 | /* Check to see if we are in fact sending anything for this |
1299 | * space by checking the mask. If so, update the mask. |
1337 | * space by checking the mask. If so, update the mask. |
1300 | * if not, reset the len to that from before adding the mask |
1338 | * if not, reset the len to that from before adding the mask |
1301 | * value, so we don't send those bits. |
1339 | * value, so we don't send those bits. |
… | |
… | |
1360 | socket.send_packet (sl); |
1398 | socket.send_packet (sl); |
1361 | socket.sent_scroll = 0; |
1399 | socket.sent_scroll = 0; |
1362 | } |
1400 | } |
1363 | } |
1401 | } |
1364 | |
1402 | |
1365 | /** |
|
|
1366 | * Draws client map. |
|
|
1367 | */ |
|
|
1368 | void |
|
|
1369 | draw_client_map (object *pl) |
|
|
1370 | { |
|
|
1371 | int i, j; |
|
|
1372 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
|
|
1373 | int mflags; |
|
|
1374 | struct Map newmap; |
|
|
1375 | maptile *m, *pm; |
|
|
1376 | |
|
|
1377 | if (pl->type != PLAYER) |
|
|
1378 | { |
|
|
1379 | LOG (llevError, "draw_client_map called with non player/non eric-server\n"); |
|
|
1380 | return; |
|
|
1381 | } |
|
|
1382 | |
|
|
1383 | pm = pl->map; |
|
|
1384 | |
|
|
1385 | /* If player is just joining the game, he isn't here yet, so the map |
|
|
1386 | * can get swapped out. If so, don't try to send them a map. All will |
|
|
1387 | * be OK once they really log in. |
|
|
1388 | */ |
|
|
1389 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
|
|
1390 | return; |
|
|
1391 | |
|
|
1392 | memset (&newmap, 0, sizeof (struct Map)); |
|
|
1393 | |
|
|
1394 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
|
|
1395 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
|
|
1396 | { |
|
|
1397 | ax = i; |
|
|
1398 | ay = j; |
|
|
1399 | m = pm; |
|
|
1400 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1401 | |
|
|
1402 | if (mflags & P_OUT_OF_MAP) |
|
|
1403 | continue; |
|
|
1404 | |
|
|
1405 | /* If a map is visible to the player, we don't want to swap it out |
|
|
1406 | * just to reload it. This should really call something like |
|
|
1407 | * swap_map, but this is much more efficient and 'good enough' |
|
|
1408 | */ |
|
|
1409 | if (mflags & P_NEW_MAP) |
|
|
1410 | m->timeout = 50; |
|
|
1411 | } |
|
|
1412 | |
|
|
1413 | /* do LOS after calls to update_position */ |
|
|
1414 | if (pl->contr->do_los) |
|
|
1415 | { |
|
|
1416 | update_los (pl); |
|
|
1417 | pl->contr->do_los = 0; |
|
|
1418 | } |
|
|
1419 | |
|
|
1420 | /* Big maps need a different drawing mechanism to work */ |
|
|
1421 | draw_client_map1 (pl); |
|
|
1422 | } |
|
|
1423 | |
|
|
1424 | |
|
|
1425 | /*****************************************************************************/ |
1403 | /*****************************************************************************/ |
1426 | |
|
|
1427 | /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ |
1404 | /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ |
1428 | |
|
|
1429 | /* a player. Of course, the client need to know the command to be able to */ |
1405 | /* a player. Of course, the client need to know the command to be able to */ |
1430 | |
|
|
1431 | /* manage it ! */ |
1406 | /* manage it ! */ |
1432 | |
|
|
1433 | /*****************************************************************************/ |
1407 | /*****************************************************************************/ |
1434 | void |
1408 | void |
1435 | send_plugin_custom_message (object *pl, char *buf) |
1409 | send_plugin_custom_message (object *pl, char *buf) |
1436 | { |
1410 | { |
1437 | pl->contr->ns->send_packet (buf); |
1411 | pl->contr->ns->send_packet (buf); |
… | |
… | |
1448 | sl << "replyinfo skill_info\n"; |
1422 | sl << "replyinfo skill_info\n"; |
1449 | |
1423 | |
1450 | for (int i = 1; i < NUM_SKILLS; i++) |
1424 | for (int i = 1; i < NUM_SKILLS; i++) |
1451 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1425 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1452 | |
1426 | |
1453 | if (sl.length () >= MAXSOCKBUF) |
1427 | if (sl.length () > MAXSOCKBUF) |
1454 | { |
1428 | { |
1455 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1429 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1456 | fatal (0); |
1430 | fatal (0); |
1457 | } |
1431 | } |
1458 | |
1432 | |
… | |
… | |
1471 | sl << "replyinfo spell_paths\n"; |
1445 | sl << "replyinfo spell_paths\n"; |
1472 | |
1446 | |
1473 | for (int i = 0; i < NRSPELLPATHS; i++) |
1447 | for (int i = 0; i < NRSPELLPATHS; i++) |
1474 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1448 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1475 | |
1449 | |
1476 | if (sl.length () >= MAXSOCKBUF) |
1450 | if (sl.length () > MAXSOCKBUF) |
1477 | { |
1451 | { |
1478 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1452 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1479 | fatal (0); |
1453 | fatal (0); |
1480 | } |
1454 | } |
1481 | |
1455 | |
… | |
… | |
1589 | if (!spell->face) |
1563 | if (!spell->face) |
1590 | { |
1564 | { |
1591 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1565 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1592 | spell->face = face_find ("burnout.x11", blank_face); |
1566 | spell->face = face_find ("burnout.x11", blank_face); |
1593 | } |
1567 | } |
|
|
1568 | |
|
|
1569 | pl->ns->send_face (spell->face); |
1594 | |
1570 | |
1595 | /* send the current values */ |
1571 | /* send the current values */ |
1596 | sl << uint32 (spell->count) |
1572 | sl << uint32 (spell->count) |
1597 | << uint16 (spell->level) |
1573 | << uint16 (spell->level) |
1598 | << uint16 (spell->casting_time) |
1574 | << uint16 (spell->casting_time) |
… | |
… | |
1634 | * bytes and 3 strings (because that is the spec) so we need to |
1610 | * bytes and 3 strings (because that is the spec) so we need to |
1635 | * check that the length of those 3 strings, plus the 23 bytes, |
1611 | * check that the length of those 3 strings, plus the 23 bytes, |
1636 | * won't take us over the length limit for the socket, if it does, |
1612 | * won't take us over the length limit for the socket, if it does, |
1637 | * we need to send what we already have, and restart packet formation |
1613 | * we need to send what we already have, and restart packet formation |
1638 | */ |
1614 | */ |
|
|
1615 | if (spell->type != SPELL) |
|
|
1616 | continue; |
|
|
1617 | |
1639 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1618 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1640 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1619 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1641 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1620 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1642 | * like it will fix this |
1621 | * like it will fix this |
1643 | */ |
1622 | */ |
1644 | if (spell->type != SPELL) |
|
|
1645 | continue; |
|
|
1646 | |
|
|
1647 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1623 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1648 | { |
1624 | { |
|
|
1625 | pl->ns->flush_fx (); |
1649 | pl->ns->send_packet (sl); |
1626 | pl->ns->send_packet (sl); |
1650 | |
1627 | |
1651 | sl.reset (); |
1628 | sl.reset (); |
1652 | sl << "addspell "; |
1629 | sl << "addspell "; |
1653 | } |
1630 | } |
… | |
… | |
1661 | return; |
1638 | return; |
1662 | } |
1639 | } |
1663 | else |
1640 | else |
1664 | append_spell (pl, sl, spell); |
1641 | append_spell (pl, sl, spell); |
1665 | |
1642 | |
1666 | if (sl.length () >= MAXSOCKBUF) |
1643 | if (sl.length () > MAXSOCKBUF) |
1667 | { |
1644 | { |
1668 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1645 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1669 | fatal (0); |
1646 | fatal (0); |
1670 | } |
1647 | } |
1671 | |
1648 | |
1672 | /* finally, we can send the packet */ |
1649 | /* finally, we can send the packet */ |
|
|
1650 | pl->ns->flush_fx (); |
1673 | pl->ns->send_packet (sl); |
1651 | pl->ns->send_packet (sl); |
1674 | } |
1652 | } |
1675 | |
1653 | |