1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2001 Mark Wedel |
5 | * Copyright (C) 2001 Mark Wedel |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | 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 |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | 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 |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /** |
25 | /** |
25 | * \file |
26 | * \file |
26 | * Client handling. |
27 | * Client handling. |
27 | * |
28 | * |
… | |
… | |
35 | * have the prototype of (char *data, int datalen, int client_num). This |
36 | * have the prototype of (char *data, int datalen, int client_num). This |
36 | * way, we can use one dispatch table. |
37 | * way, we can use one dispatch table. |
37 | * |
38 | * |
38 | * esrv_map_new starts updating the map |
39 | * esrv_map_new starts updating the map |
39 | * |
40 | * |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
|
|
41 | * if a face has not already been sent to the client, it is sent now. |
|
|
42 | * |
|
|
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
44 | * operations |
|
|
45 | * |
|
|
46 | */ |
41 | */ |
47 | |
42 | |
48 | #include <global.h> |
43 | #include <global.h> |
49 | #include <sproto.h> |
44 | #include <sproto.h> |
50 | |
45 | |
… | |
… | |
86 | -1, /* life stealing */ |
81 | -1, /* life stealing */ |
87 | -1 /* Disease - not fully done yet */ |
82 | -1 /* Disease - not fully done yet */ |
88 | }; |
83 | }; |
89 | |
84 | |
90 | static void |
85 | static void |
91 | socket_map_scroll (client * ns, int dx, int dy) |
86 | socket_map_scroll (client *ns, int dx, int dy) |
92 | { |
87 | { |
93 | struct Map newmap; |
88 | struct Map newmap; |
94 | int x, y, mx, my; |
89 | int x, y, mx, my; |
95 | |
90 | |
96 | { |
|
|
97 | packet sl; |
|
|
98 | |
|
|
99 | sl.printf ("map_scroll %d %d", dx, dy); |
91 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
100 | ns->send_packet (sl); |
|
|
101 | } |
|
|
102 | |
92 | |
103 | /* If we are using the Map1aCmd, we may in fact send |
93 | /* If we are using the Map1aCmd, we may in fact send |
104 | * head information that is outside the viewable map. |
94 | * head information that is outside the viewable map. |
105 | * So set the mx,my to the max value we want to |
95 | * So set the mx,my to the max value we want to |
106 | * look for. Removed code to do so - it caused extra |
96 | * look for. Removed code to do so - it caused extra |
… | |
… | |
108 | * that much difference in bandwidth. |
98 | * that much difference in bandwidth. |
109 | */ |
99 | */ |
110 | mx = ns->mapx; |
100 | mx = ns->mapx; |
111 | my = ns->mapy; |
101 | my = ns->mapy; |
112 | |
102 | |
113 | if (ns->mapmode == Map1aCmd) |
|
|
114 | { |
|
|
115 | mx += MAX_HEAD_OFFSET; |
|
|
116 | my += MAX_HEAD_OFFSET; |
|
|
117 | } |
|
|
118 | |
|
|
119 | /* the x and y here are coordinates for the new map, i.e. if we moved |
103 | /* the x and y here are coordinates for the new map, i.e. if we moved |
120 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
104 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
121 | * if the destination x or y coordinate is outside the viewable |
105 | * if the destination x or y coordinate is outside the viewable |
122 | * area, we clear the values - otherwise, the old values |
106 | * area, we clear the values - otherwise, the old values |
123 | * are preserved, and the check_head thinks it needs to clear them. |
107 | * are preserved, and the check_head thinks it needs to clear them. |
… | |
… | |
146 | } |
130 | } |
147 | |
131 | |
148 | static void |
132 | static void |
149 | clear_map (player *pl) |
133 | clear_map (player *pl) |
150 | { |
134 | { |
151 | client &socket = *pl->socket; |
|
|
152 | |
|
|
153 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
154 | |
136 | |
155 | if (socket.newmapcmd == 1) |
137 | if (pl->ns->newmapcmd == 1) |
156 | socket.send_packet ("newmap"); |
138 | pl->ns->send_packet ("newmap"); |
157 | |
139 | |
158 | socket.update_look = 1; |
140 | pl->ns->floorbox_reset (); |
159 | socket.look_position = 0; |
|
|
160 | } |
141 | } |
161 | |
142 | |
162 | /** check for map change and send new map data */ |
143 | /** check for map/region change and send new map data */ |
163 | static void |
144 | static void |
164 | check_map_change (player *pl) |
145 | check_map_change (player *pl) |
165 | { |
146 | { |
166 | client &socket = *pl->socket; |
147 | client &socket = *pl->ns; |
167 | object *ob = pl->ob; |
148 | object *ob = pl->ob; |
168 | char buf[MAX_BUF]; /* eauugggh */ |
149 | char buf[MAX_BUF]; /* eauugggh */ |
169 | |
150 | |
170 | if (socket.current_map != ob->map) |
151 | if (socket.current_map != ob->map) |
171 | { |
152 | { |
… | |
… | |
187 | flags |= 4; |
168 | flags |= 4; |
188 | if (ob->map->tile_path[3]) |
169 | if (ob->map->tile_path[3]) |
189 | flags |= 8; |
170 | flags |= 8; |
190 | |
171 | |
191 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
172 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
192 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
173 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
193 | } |
174 | } |
194 | else |
175 | else |
195 | snprintf (buf, MAX_BUF, "mapinfo current"); |
176 | snprintf (buf, MAX_BUF, "mapinfo current"); |
196 | |
177 | |
197 | socket.send_packet (buf); |
178 | socket.send_packet (buf); |
… | |
… | |
205 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
186 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
206 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
187 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
207 | else |
188 | else |
208 | { |
189 | { |
209 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
190 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
210 | socket.update_look = 1; |
191 | socket.floorbox_reset (); |
211 | socket.look_position = 0; |
|
|
212 | } |
192 | } |
213 | } |
193 | } |
214 | |
194 | |
215 | socket.current_x = ob->x; |
195 | socket.current_x = ob->x; |
216 | socket.current_y = ob->y; |
196 | socket.current_y = ob->y; |
|
|
197 | |
|
|
198 | region *reg = ob->region (); |
|
|
199 | if (socket.current_region != reg) |
|
|
200 | { |
|
|
201 | socket.current_region = reg; |
|
|
202 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
203 | } |
217 | } |
204 | } |
218 | |
205 | |
219 | /** |
206 | /** |
220 | * RequestInfo is sort of a meta command. There is some specific |
207 | * RequestInfo is sort of a meta command. There is some specific |
221 | * request of information, but we call other functions to provide |
208 | * request of information, but we call other functions to provide |
… | |
… | |
265 | { |
252 | { |
266 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
253 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
267 | } |
254 | } |
268 | |
255 | |
269 | void |
256 | void |
|
|
257 | ExtiCmd (char *buf, int len, client *ns) |
|
|
258 | { |
|
|
259 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
260 | } |
|
|
261 | |
|
|
262 | void |
270 | MapInfoCmd (char *buf, int len, player *pl) |
263 | MapInfoCmd (char *buf, int len, player *pl) |
271 | { |
264 | { |
272 | // <mapinfo tag spatial tile-path |
265 | // <mapinfo tag spatial tile-path |
273 | // >mapinfo tag spatial flags x y w h hash |
266 | // >mapinfo tag spatial flags x y w h hash |
274 | |
267 | |
… | |
… | |
286 | buf += 8; |
279 | buf += 8; |
287 | |
280 | |
288 | // initial map and its origin |
281 | // initial map and its origin |
289 | maptile *map = pl->ob->map; |
282 | maptile *map = pl->ob->map; |
290 | sint16 dx, dy; |
283 | sint16 dx, dy; |
291 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
284 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
292 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
285 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
293 | int max_distance = 8; // limit maximum path length to something generous |
286 | int max_distance = 8; // limit maximum path length to something generous |
294 | |
287 | |
295 | while (*buf && map && max_distance) |
288 | while (*buf && map && max_distance) |
296 | { |
289 | { |
297 | int dir = *buf++; |
290 | int dir = *buf++; |
298 | |
291 | |
299 | switch (dir) |
292 | switch (dir) |
300 | { |
293 | { |
301 | case '1': |
294 | case '1': |
302 | dx = 0; |
295 | dx = 0; |
303 | dy = -1; |
296 | dy = -1; |
304 | map = get_map_from_coord (map, &dx, &dy); |
297 | map = map->xy_find (dx, dy); |
305 | map && (mapy -= map->height); |
298 | map && (mapy -= map->height); |
306 | break; |
299 | break; |
307 | case '2': |
300 | case '2': |
308 | mapx += map->width; |
301 | mapx += map->width; |
309 | dx = map->width; |
302 | dx = map->width; |
310 | dy = 0; |
303 | dy = 0; |
311 | map = get_map_from_coord (map, &dx, &dy); |
304 | map = map->xy_find (dx, dy); |
312 | break; |
305 | break; |
313 | case '3': |
306 | case '3': |
314 | mapy += map->height; |
307 | mapy += map->height; |
315 | dx = 0; |
308 | dx = 0; |
316 | dy = map->height; |
309 | dy = map->height; |
317 | map = get_map_from_coord (map, &dx, &dy); |
310 | map = map->xy_find (dx, dy); |
318 | break; |
311 | break; |
319 | case '4': |
312 | case '4': |
320 | dx = -1; |
313 | dx = -1; |
321 | dy = 0; |
314 | dy = 0; |
322 | map = get_map_from_coord (map, &dx, &dy); |
315 | map = map->xy_find (dx, dy); |
323 | map && (mapx -= map->width); |
316 | map && (mapx -= map->width); |
324 | break; |
317 | break; |
325 | } |
318 | } |
326 | |
319 | |
327 | --max_distance; |
320 | --max_distance; |
328 | } |
321 | } |
329 | |
322 | |
… | |
… | |
340 | if (map->tile_path[2]) |
333 | if (map->tile_path[2]) |
341 | flags |= 4; |
334 | flags |= 4; |
342 | if (map->tile_path[3]) |
335 | if (map->tile_path[3]) |
343 | flags |= 8; |
336 | flags |= 8; |
344 | |
337 | |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
338 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
346 | } |
339 | } |
347 | else |
340 | else |
348 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
341 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
349 | } |
342 | } |
350 | else |
343 | else |
351 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
344 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
352 | |
345 | |
353 | pl->socket->send_packet (bigbuf); |
346 | pl->ns->send_packet (bigbuf); |
354 | } |
347 | } |
355 | |
348 | |
356 | /** This is the Setup cmd - easy first implementation */ |
349 | /** This is the Setup cmd - easy first implementation */ |
357 | void |
350 | void |
358 | SetUp (char *buf, int len, client * ns) |
351 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
405 | { |
398 | { |
406 | ns->sound = atoi (param); |
399 | ns->sound = atoi (param); |
407 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
400 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | } |
401 | } |
409 | else if (!strcmp (cmd, "exp64")) |
402 | else if (!strcmp (cmd, "exp64")) |
410 | { |
|
|
411 | ns->exp64 = atoi (param); |
|
|
412 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
403 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
413 | } |
|
|
414 | else if (!strcmp (cmd, "spellmon")) |
404 | else if (!strcmp (cmd, "spellmon")) |
415 | { |
405 | { |
416 | ns->monitor_spells = atoi (param); |
406 | ns->monitor_spells = atoi (param); |
417 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
407 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
418 | } |
408 | } |
… | |
… | |
441 | } |
431 | } |
442 | else if (!strcmp (cmd, "newmapcmd")) |
432 | else if (!strcmp (cmd, "newmapcmd")) |
443 | { |
433 | { |
444 | ns->newmapcmd = atoi (param); |
434 | ns->newmapcmd = atoi (param); |
445 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
435 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
446 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
447 | // ns->plugincmd = atoi(param); |
|
|
448 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
449 | } |
436 | } |
450 | else if (!strcmp (cmd, "mapinfocmd")) |
437 | else if (!strcmp (cmd, "mapinfocmd")) |
451 | { |
438 | { |
452 | ns->mapinfocmd = atoi (param); |
439 | ns->mapinfocmd = atoi (param); |
453 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
440 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
… | |
… | |
472 | char tmpbuf[20]; |
459 | char tmpbuf[20]; |
473 | int q = atoi (param); |
460 | int q = atoi (param); |
474 | |
461 | |
475 | if (is_valid_faceset (q)) |
462 | if (is_valid_faceset (q)) |
476 | ns->faceset = q; |
463 | ns->faceset = q; |
|
|
464 | |
477 | sprintf (tmpbuf, "%d", ns->faceset); |
465 | sprintf (tmpbuf, "%d", ns->faceset); |
478 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
466 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
479 | /* if the client is using faceset, it knows about image2 command */ |
467 | /* if the client is using faceset, it knows about image2 command */ |
480 | ns->image2 = 1; |
468 | ns->image2 = 1; |
481 | } |
469 | } |
… | |
… | |
509 | if (*cp == 'x' || *cp == 'X') |
497 | if (*cp == 'x' || *cp == 'X') |
510 | { |
498 | { |
511 | y = atoi (cp + 1); |
499 | y = atoi (cp + 1); |
512 | break; |
500 | break; |
513 | } |
501 | } |
|
|
502 | |
514 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
503 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
515 | { |
504 | { |
516 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
505 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
517 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
506 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
518 | } |
507 | } |
… | |
… | |
575 | * it either has to be here or init_sockets needs to be exported. |
564 | * it either has to be here or init_sockets needs to be exported. |
576 | */ |
565 | */ |
577 | void |
566 | void |
578 | AddMeCmd (char *buf, int len, client * ns) |
567 | AddMeCmd (char *buf, int len, client * ns) |
579 | { |
568 | { |
580 | Settings oldsettings; |
569 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
581 | |
|
|
582 | oldsettings = settings; |
|
|
583 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
584 | ns->send_packet ("addme_failed"); |
|
|
585 | else |
|
|
586 | ns->send_packet ("addme_success"); |
|
|
587 | |
|
|
588 | settings = oldsettings; |
|
|
589 | } |
570 | } |
590 | |
571 | |
591 | /** Reply to ExtendedInfos command */ |
572 | /** Reply to ExtendedInfos command */ |
592 | void |
573 | void |
593 | ToggleExtendedInfos (char *buf, int len, client * ns) |
574 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
703 | |
684 | |
704 | ns->send_packet (cmdback); |
685 | ns->send_packet (cmdback); |
705 | } |
686 | } |
706 | |
687 | |
707 | /** |
688 | /** |
708 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
|
|
709 | * Basically, it makes no sense to wait for the client to request a |
|
|
710 | * a piece of data from us that we know the client wants. So |
|
|
711 | * if we know the client wants it, might as well push it to the |
|
|
712 | * client. |
|
|
713 | */ |
|
|
714 | static void |
|
|
715 | SendSmooth (client * ns, uint16 face) |
|
|
716 | { |
|
|
717 | uint16 smoothface; |
|
|
718 | |
|
|
719 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
720 | * again. |
|
|
721 | */ |
|
|
722 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
|
|
723 | { |
|
|
724 | |
|
|
725 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
|
|
726 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
727 | return; |
|
|
728 | } |
|
|
729 | |
|
|
730 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
731 | esrv_send_face (ns, smoothface, 0); |
|
|
732 | |
|
|
733 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
734 | |
|
|
735 | packet sl; |
|
|
736 | |
|
|
737 | sl << "smooth " |
|
|
738 | << uint16 (face) |
|
|
739 | << uint16 (smoothface); |
|
|
740 | |
|
|
741 | ns->send_packet (sl); |
|
|
742 | } |
|
|
743 | |
|
|
744 | /** |
|
|
745 | * Tells client the picture it has to use |
689 | * Tells client the picture it has to use |
746 | * to smooth a picture number given as argument. |
690 | * to smooth a picture number given as argument. |
747 | */ |
691 | */ |
748 | void |
692 | void |
749 | AskSmooth (char *buf, int len, client * ns) |
693 | AskSmooth (char *buf, int len, client *ns) |
750 | { |
694 | { |
751 | uint16 facenbr; |
695 | ns->send_face (atoi (buf)); |
752 | |
|
|
753 | facenbr = atoi (buf); |
|
|
754 | SendSmooth (ns, facenbr); |
|
|
755 | } |
696 | } |
756 | |
697 | |
757 | /** |
698 | /** |
758 | * This handles the general commands from the client (ie, north, fire, cast, |
699 | * This handles the general commands from the client (ie, north, fire, cast, |
759 | * etc.) |
700 | * etc.) |
760 | */ |
701 | */ |
761 | void |
702 | void |
762 | PlayerCmd (char *buf, int len, player *pl) |
703 | PlayerCmd (char *buf, int len, player *pl) |
763 | { |
704 | { |
764 | |
|
|
765 | /* The following should never happen with a proper or honest client. |
|
|
766 | * Therefore, the error message doesn't have to be too clear - if |
|
|
767 | * someone is playing with a hacked/non working client, this gives them |
|
|
768 | * an idea of the problem, but they deserve what they get |
|
|
769 | */ |
|
|
770 | if (pl->state != ST_PLAYING) |
|
|
771 | { |
|
|
772 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
773 | return; |
|
|
774 | } |
|
|
775 | /* Check if there is a count. In theory, a zero count could also be |
705 | /* Check if there is a count. In theory, a zero count could also be |
776 | * sent, so check for that also. |
706 | * sent, so check for that also. |
777 | */ |
707 | */ |
778 | if (atoi (buf) || buf[0] == '0') |
708 | if (atoi (buf) || buf[0] == '0') |
779 | { |
709 | { |
780 | pl->count = atoi ((char *) buf); |
710 | pl->count = atoi ((char *) buf); |
|
|
711 | |
781 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
712 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
782 | if (!buf) |
713 | if (!buf) |
783 | { |
|
|
784 | #ifdef ESRV_DEBUG |
|
|
785 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
786 | #endif |
|
|
787 | return; |
714 | return; |
788 | } |
715 | |
789 | buf++; |
716 | buf++; |
790 | } |
717 | } |
791 | /* This should not happen anymore. */ |
718 | |
792 | if (pl->ob->speed_left < -1.0) |
|
|
793 | { |
|
|
794 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
795 | } |
|
|
796 | /* In c_new.c */ |
|
|
797 | execute_newserver_command (pl->ob, (char *) buf); |
719 | execute_newserver_command (pl->ob, (char *) buf); |
798 | /* Perhaps something better should be done with a left over count. |
|
|
799 | * Cleaning up the input should probably be done first - all actions |
|
|
800 | * for the command that issued the count should be done before any other |
|
|
801 | * commands. |
|
|
802 | */ |
|
|
803 | |
720 | |
804 | pl->count = 0; |
|
|
805 | |
|
|
806 | } |
|
|
807 | |
|
|
808 | |
|
|
809 | /** |
|
|
810 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
811 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
812 | * 'ncom' method which gives more information back to the client so it |
|
|
813 | * can throttle. |
|
|
814 | */ |
|
|
815 | void |
|
|
816 | NewPlayerCmd (char *buf, int len, player *pl) |
|
|
817 | { |
|
|
818 | int time, repeat; |
|
|
819 | char command[MAX_BUF]; |
|
|
820 | int pktlen; |
|
|
821 | |
|
|
822 | if (len < 7) |
|
|
823 | { |
|
|
824 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
825 | return; |
|
|
826 | } |
|
|
827 | |
|
|
828 | pktlen = net_uint16 ((uint8 *)buf); |
|
|
829 | repeat = net_uint32 ((uint8 *)buf + 2); |
|
|
830 | |
|
|
831 | /* -1 is special - no repeat, but don't update */ |
|
|
832 | if (repeat != -1) |
|
|
833 | pl->count = repeat; |
|
|
834 | |
|
|
835 | if ((len - 4) >= MAX_BUF) |
|
|
836 | len = MAX_BUF - 5; |
|
|
837 | |
|
|
838 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
839 | command[len - 4] = 0; |
|
|
840 | |
|
|
841 | /* This should not happen anymore. */ |
|
|
842 | if (pl->ob->speed_left < -1.0) |
|
|
843 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
844 | |
|
|
845 | /* In c_new.c */ |
|
|
846 | execute_newserver_command (pl->ob, (char *) command); |
|
|
847 | /* Perhaps something better should be done with a left over count. |
721 | /* Perhaps something better should be done with a left over count. |
848 | * Cleaning up the input should probably be done first - all actions |
722 | * Cleaning up the input should probably be done first - all actions |
849 | * for the command that issued the count should be done before any other |
723 | * for the command that issued the count should be done before any other |
850 | * commands. |
724 | * commands. |
851 | */ |
725 | */ |
852 | pl->count = 0; |
726 | pl->count = 0; |
|
|
727 | } |
853 | |
728 | |
854 | if (FABS (pl->ob->speed) < 0.001) |
729 | |
|
|
730 | /** |
|
|
731 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
732 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
733 | * 'ncom' method which gives more information back to the client so it |
|
|
734 | * can throttle. |
|
|
735 | */ |
|
|
736 | void |
|
|
737 | NewPlayerCmd (char *buf, int len, player *pl) |
|
|
738 | { |
|
|
739 | if (len <= 6) |
|
|
740 | { |
|
|
741 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
742 | return; |
|
|
743 | } |
|
|
744 | |
|
|
745 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
|
|
746 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
|
|
747 | |
|
|
748 | /* -1 is special - no repeat, but don't update */ |
|
|
749 | if (repeat != -1) |
|
|
750 | pl->count = repeat; |
|
|
751 | |
|
|
752 | buf += 6; //len -= 6; |
|
|
753 | |
|
|
754 | execute_newserver_command (pl->ob, buf); |
|
|
755 | |
|
|
756 | /* Perhaps something better should be done with a left over count. |
|
|
757 | * Cleaning up the input should probably be done first - all actions |
|
|
758 | * for the command that issued the count should be done before any other |
|
|
759 | * commands. |
|
|
760 | */ |
|
|
761 | pl->count = 0; |
|
|
762 | |
|
|
763 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
|
|
764 | int time = fabs (pl->ob->speed) < 0.001 |
855 | time = MAX_TIME * 100; |
765 | ? time = MAX_TIME * 100 |
856 | else |
|
|
857 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
766 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
858 | |
767 | |
859 | /* Send confirmation of command execution now */ |
768 | /* Send confirmation of command execution now */ |
860 | |
769 | packet sl ("comc"); |
861 | packet sl; |
|
|
862 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
770 | sl << uint16 (cmdid) << uint32 (time); |
863 | pl->socket->send_packet (sl); |
771 | pl->ns->send_packet (sl); |
864 | } |
772 | } |
865 | |
|
|
866 | |
773 | |
867 | /** This is a reply to a previous query. */ |
774 | /** This is a reply to a previous query. */ |
868 | void |
775 | void |
869 | ReplyCmd (char *buf, int len, player *pl) |
776 | ReplyCmd (char *buf, int len, client *ns) |
870 | { |
777 | { |
|
|
778 | if (ns->state == ST_CUSTOM) |
|
|
779 | { |
|
|
780 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
781 | return; |
|
|
782 | } |
|
|
783 | |
|
|
784 | if (!ns->pl) |
|
|
785 | return; //TODO: depends on the exact reply we are after |
|
|
786 | //TODO: but right now, we always have a ns->pl |
|
|
787 | |
|
|
788 | player *pl = ns->pl; |
|
|
789 | |
871 | /* This is to synthesize how the data would be stored if it |
790 | /* This is to synthesize how the data would be stored if it |
872 | * was normally entered. A bit of a hack, and should be cleaned up |
791 | * was normally entered. A bit of a hack, and should be cleaned up |
873 | * once all the X11 code is removed from the server. |
792 | * once all the X11 code is removed from the server. |
874 | * |
793 | * |
875 | * We pass 13 to many of the functions because this way they |
794 | * We pass 13 to many of the functions because this way they |
876 | * think it was the carriage return that was entered, and the |
795 | * think it was the carriage return that was entered, and the |
877 | * function then does not try to do additional input. |
796 | * function then does not try to do additional input. |
878 | */ |
797 | */ |
879 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
798 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
880 | |
799 | |
881 | /* this avoids any hacking here */ |
800 | /* this avoids any hacking here */ |
882 | |
801 | |
883 | switch (pl->state) |
802 | switch (ns->state) |
884 | { |
803 | { |
885 | case ST_PLAYING: |
804 | case ST_PLAYING: |
886 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
805 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
887 | break; |
806 | break; |
888 | |
807 | |
889 | case ST_PLAY_AGAIN: |
|
|
890 | /* We can check this for return value (2==quit). Maybe we |
|
|
891 | * should, and do something appropriate? |
|
|
892 | */ |
|
|
893 | receive_play_again (pl->ob, buf[0]); |
|
|
894 | break; |
|
|
895 | |
|
|
896 | case ST_ROLL_STAT: |
|
|
897 | key_roll_stat (pl->ob, buf[0]); |
|
|
898 | break; |
|
|
899 | |
|
|
900 | case ST_CHANGE_CLASS: |
808 | case ST_CHANGE_CLASS: |
901 | |
|
|
902 | key_change_class (pl->ob, buf[0]); |
809 | key_change_class (pl->ob, buf[0]); |
903 | break; |
810 | break; |
904 | |
811 | |
905 | case ST_CONFIRM_QUIT: |
|
|
906 | key_confirm_quit (pl->ob, buf[0]); |
|
|
907 | break; |
|
|
908 | |
|
|
909 | case ST_CONFIGURE: |
|
|
910 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
911 | pl->state = ST_PLAYING; |
|
|
912 | break; |
|
|
913 | |
|
|
914 | case ST_GET_NAME: |
|
|
915 | receive_player_name (pl->ob, 13); |
|
|
916 | break; |
|
|
917 | |
|
|
918 | case ST_GET_PASSWORD: |
|
|
919 | case ST_CONFIRM_PASSWORD: |
|
|
920 | receive_player_password (pl->ob, 13); |
|
|
921 | break; |
|
|
922 | |
|
|
923 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
812 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
924 | receive_party_password (pl->ob, 13); |
813 | receive_party_password (pl->ob, 13); |
925 | break; |
814 | break; |
926 | |
815 | |
927 | default: |
816 | default: |
928 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
817 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
929 | } |
818 | } |
930 | } |
819 | } |
931 | |
820 | |
932 | /** |
821 | /** |
933 | * Client tells its version. If there is a mismatch, we close the |
822 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
937 | * problem. |
826 | * problem. |
938 | */ |
827 | */ |
939 | void |
828 | void |
940 | VersionCmd (char *buf, int len, client * ns) |
829 | VersionCmd (char *buf, int len, client * ns) |
941 | { |
830 | { |
942 | char *cp; |
|
|
943 | char version_warning[256]; |
|
|
944 | |
|
|
945 | if (!buf) |
831 | if (!buf) |
946 | { |
832 | { |
947 | LOG (llevError, "CS: received corrupted version command\n"); |
833 | LOG (llevError, "CS: received corrupted version command\n"); |
948 | return; |
834 | return; |
949 | } |
835 | } |
950 | |
836 | |
951 | ns->cs_version = atoi (buf); |
837 | ns->cs_version = atoi (buf); |
952 | ns->sc_version = ns->cs_version; |
838 | ns->sc_version = ns->cs_version; |
|
|
839 | |
|
|
840 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
841 | |
|
|
842 | //TODO: should log here just for statistics |
|
|
843 | |
953 | if (VERSION_CS != ns->cs_version) |
844 | //if (VERSION_CS != ns->cs_version) |
954 | { |
845 | // unchecked; |
955 | #ifdef ESRV_DEBUG |
846 | |
956 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
957 | #endif |
|
|
958 | } |
|
|
959 | cp = strchr (buf + 1, ' '); |
847 | char *cp = strchr (buf + 1, ' '); |
960 | if (!cp) |
848 | if (!cp) |
961 | return; |
849 | return; |
|
|
850 | |
962 | ns->sc_version = atoi (cp); |
851 | ns->sc_version = atoi (cp); |
|
|
852 | |
963 | if (VERSION_SC != ns->sc_version) |
853 | //if (VERSION_SC != ns->sc_version) |
964 | { |
854 | // unchecked; |
965 | #ifdef ESRV_DEBUG |
855 | |
966 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
967 | #endif |
|
|
968 | } |
|
|
969 | cp = strchr (cp + 1, ' '); |
856 | cp = strchr (cp + 1, ' '); |
|
|
857 | |
970 | if (cp) |
858 | if (cp) |
971 | { |
859 | { |
972 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
|
|
973 | |
|
|
974 | assign (ns->version, cp + 1); |
860 | assign (ns->version, cp + 1); |
975 | |
861 | |
976 | if (ns->sc_version < 1026) |
862 | if (ns->sc_version < 1026) |
977 | { |
863 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
978 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
979 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
864 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
980 | ns->send_packet (version_warning); |
|
|
981 | } |
|
|
982 | |
|
|
983 | } |
865 | } |
984 | } |
866 | } |
985 | |
867 | |
986 | /** sound related functions. */ |
868 | /** sound related functions. */ |
987 | void |
869 | void |
… | |
… | |
989 | { |
871 | { |
990 | ns->sound = atoi (buf); |
872 | ns->sound = atoi (buf); |
991 | } |
873 | } |
992 | |
874 | |
993 | /** client wants the map resent */ |
875 | /** client wants the map resent */ |
994 | |
|
|
995 | void |
876 | void |
996 | MapRedrawCmd (char *buf, int len, player *pl) |
877 | MapRedrawCmd (char *buf, int len, player *pl) |
997 | { |
878 | { |
998 | |
|
|
999 | /* This function is currently disabled; just clearing the map state results in |
879 | /* This function is currently disabled; just clearing the map state results in |
1000 | * display errors. It should clear the cache and send a newmap command. |
880 | * display errors. It should clear the cache and send a newmap command. |
1001 | * Unfortunately this solution does not work because some client versions send |
881 | * Unfortunately this solution does not work because some client versions send |
1002 | * a mapredraw command after receiving a newmap command. |
882 | * a mapredraw command after receiving a newmap command. |
1003 | */ |
883 | */ |
1004 | #if 0 |
|
|
1005 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
1006 | * clear the "cache" |
|
|
1007 | */ |
|
|
1008 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
1009 | draw_client_map (pl->ob); |
|
|
1010 | #endif |
|
|
1011 | } |
884 | } |
1012 | |
885 | |
1013 | /** |
886 | /** |
1014 | * Moves an object (typically, container to inventory). |
887 | * Moves an object (typically, container to inventory). |
1015 | * syntax is: move (to) (tag) (nrof) |
888 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1018 | MoveCmd (char *buf, int len, player *pl) |
891 | MoveCmd (char *buf, int len, player *pl) |
1019 | { |
892 | { |
1020 | int vals[3], i; |
893 | int vals[3], i; |
1021 | |
894 | |
1022 | /* A little funky here. We only cycle for 2 records, because |
895 | /* A little funky here. We only cycle for 2 records, because |
1023 | * we obviously am not going to find a space after the third |
896 | * we obviously are not going to find a space after the third |
1024 | * record. Perhaps we should just replace this with a |
897 | * record. Perhaps we should just replace this with a |
1025 | * sscanf? |
898 | * sscanf? |
1026 | */ |
899 | */ |
1027 | for (i = 0; i < 2; i++) |
900 | for (i = 0; i < 2; i++) |
1028 | { |
901 | { |
1029 | vals[i] = atoi (buf); |
902 | vals[i] = atoi (buf); |
|
|
903 | |
1030 | if (!(buf = strchr (buf, ' '))) |
904 | if (!(buf = strchr (buf, ' '))) |
1031 | { |
905 | { |
1032 | LOG (llevError, "Incomplete move command: %s\n", buf); |
906 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1033 | return; |
907 | return; |
1034 | } |
908 | } |
|
|
909 | |
1035 | buf++; |
910 | buf++; |
1036 | } |
911 | } |
|
|
912 | |
1037 | vals[2] = atoi (buf); |
913 | vals[2] = atoi (buf); |
1038 | |
914 | |
1039 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
915 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1040 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
916 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1041 | } |
917 | } |
1042 | |
|
|
1043 | |
|
|
1044 | |
918 | |
1045 | /****************************************************************************** |
919 | /****************************************************************************** |
1046 | * |
920 | * |
1047 | * Start of commands the server sends to the client. |
921 | * Start of commands the server sends to the client. |
1048 | * |
922 | * |
… | |
… | |
1051 | /** |
925 | /** |
1052 | * Asks the client to query the user. This way, the client knows |
926 | * Asks the client to query the user. This way, the client knows |
1053 | * it needs to send something back (vs just printing out a message) |
927 | * it needs to send something back (vs just printing out a message) |
1054 | */ |
928 | */ |
1055 | void |
929 | void |
1056 | send_query (client * ns, uint8 flags, char *text) |
930 | send_query (client *ns, uint8 flags, char *text) |
1057 | { |
931 | { |
1058 | char buf[MAX_BUF]; |
|
|
1059 | |
|
|
1060 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
932 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1061 | ns->send_packet (buf); |
|
|
1062 | } |
933 | } |
1063 | |
934 | |
1064 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
935 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1065 | Old = New; \ |
936 | Old = New; \ |
1066 | sl << uint8 (Type) << uint64 (New); \ |
937 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1096 | esrv_update_stats (player *pl) |
967 | esrv_update_stats (player *pl) |
1097 | { |
968 | { |
1098 | char buf[MAX_BUF]; |
969 | char buf[MAX_BUF]; |
1099 | uint16 flags; |
970 | uint16 flags; |
1100 | |
971 | |
1101 | packet sl; |
972 | client *ns = pl->ns; |
1102 | sl << "stats "; |
973 | if (!ns) |
|
|
974 | return; |
1103 | |
975 | |
1104 | if (pl->ob != NULL) |
976 | object *ob = pl->ob; |
1105 | { |
977 | if (!ob) |
|
|
978 | return; |
|
|
979 | |
|
|
980 | packet sl ("stats"); |
|
|
981 | |
1106 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
982 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1107 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
983 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1108 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
984 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1109 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
985 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1110 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
986 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1111 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
987 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1112 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
988 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1113 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1114 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1115 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1116 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
989 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1117 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
990 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
991 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
992 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
993 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1118 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
994 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1119 | } |
|
|
1120 | |
995 | |
1121 | if (pl->socket->exp64) |
|
|
1122 | { |
|
|
1123 | uint8 s; |
|
|
1124 | |
|
|
1125 | for (s = 0; s < NUM_SKILLS; s++) |
996 | for (int s = 0; s < NUM_SKILLS; s++) |
1126 | { |
997 | if (object *skill = pl->last_skill_ob[s]) |
1127 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
998 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1128 | { |
999 | { |
|
|
1000 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1001 | |
1129 | /* Always send along the level if exp changes. This is only |
1002 | /* Always send along the level if exp changes. This is only |
1130 | * 1 extra byte, but keeps processing simpler. |
1003 | * 1 extra byte, but keeps processing simpler. |
1131 | */ |
1004 | */ |
1132 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1005 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1133 | << uint8 (pl->last_skill_ob[s]->level) |
1006 | << uint8 (skill->level) |
1134 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1007 | << uint64 (skill->stats.exp); |
1135 | |
|
|
1136 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1137 | } |
1008 | } |
1138 | } |
|
|
1139 | } |
|
|
1140 | |
1009 | |
1141 | if (pl->socket->exp64) |
|
|
1142 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1010 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1143 | else |
|
|
1144 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1145 | |
|
|
1146 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1011 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1147 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1012 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1148 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1013 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1149 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1014 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1150 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1015 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1151 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1016 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1152 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1017 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1153 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1018 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1019 | |
1154 | flags = 0; |
1020 | flags = 0; |
1155 | |
1021 | |
1156 | if (pl->fire_on) |
1022 | if (pl->fire_on) |
1157 | flags |= SF_FIREON; |
1023 | flags |= SF_FIREON; |
1158 | |
1024 | |
1159 | if (pl->run_on) |
1025 | if (pl->run_on) |
1160 | flags |= SF_RUNON; |
1026 | flags |= SF_RUNON; |
1161 | |
1027 | |
1162 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1028 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1163 | |
1029 | |
1164 | if (pl->socket->sc_version < 1025) |
1030 | if (ns->sc_version < 1025) |
1165 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1031 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1166 | else |
1032 | else |
1167 | { |
|
|
1168 | int i; |
|
|
1169 | |
|
|
1170 | for (i = 0; i < NROFATTACKS; i++) |
1033 | for (int i = 0; i < NROFATTACKS; i++) |
1171 | { |
1034 | { |
1172 | /* Skip ones we won't send */ |
1035 | /* Skip ones we won't send */ |
1173 | if (atnr_cs_stat[i] == -1) |
1036 | if (atnr_cs_stat[i] == -1) |
1174 | continue; |
1037 | continue; |
1175 | |
1038 | |
1176 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1039 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1177 | } |
1040 | } |
1178 | } |
|
|
1179 | |
1041 | |
1180 | if (pl->socket->monitor_spells) |
1042 | if (pl->ns->monitor_spells) |
1181 | { |
1043 | { |
1182 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1044 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1183 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1045 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1184 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1046 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1185 | } |
1047 | } |
1186 | |
1048 | |
1187 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1049 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1188 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1050 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1189 | set_title (pl->ob, buf); |
1051 | set_title (ob, buf); |
1190 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1052 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1191 | |
1053 | |
1192 | /* Only send it away if we have some actual data */ |
1054 | /* Only send it away if we have some actual data */ |
1193 | if (sl.length () > 6) |
1055 | if (sl.length () > 6) |
1194 | pl->socket->send_packet (sl); |
1056 | ns->send_packet (sl); |
1195 | } |
1057 | } |
1196 | |
1058 | |
1197 | /** |
1059 | /** |
1198 | * Tells the client that here is a player it should start using. |
1060 | * Tells the client that here is a player it should start using. |
1199 | */ |
1061 | */ |
1200 | void |
1062 | void |
1201 | esrv_new_player (player *pl, uint32 weight) |
1063 | esrv_new_player (player *pl, uint32 weight) |
1202 | { |
1064 | { |
1203 | pl->last_weight = weight; |
1065 | packet sl ("player"); |
1204 | |
|
|
1205 | packet sl; |
|
|
1206 | sl << "player "; |
|
|
1207 | |
1066 | |
1208 | sl << uint32 (pl->ob->count) |
1067 | sl << uint32 (pl->ob->count) |
1209 | << uint32 (weight) |
1068 | << uint32 (weight) |
1210 | << uint32 (pl->ob->face->number) |
1069 | << uint32 (pl->ob->face) |
1211 | << data8 (pl->ob->name); |
1070 | << data8 (pl->ob->name); |
1212 | |
1071 | |
|
|
1072 | pl->ns->last_weight = weight; |
1213 | pl->socket->send_packet (sl); |
1073 | pl->ns->send_packet (sl); |
1214 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1074 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1215 | } |
1075 | } |
1216 | |
|
|
1217 | /** |
|
|
1218 | * Need to send an animation sequence to the client. |
|
|
1219 | * We will send appropriate face commands to the client if we haven't |
|
|
1220 | * sent them the face yet (this can become quite costly in terms of |
|
|
1221 | * how much we are sending - on the other hand, this should only happen |
|
|
1222 | * when the player logs in and picks stuff up. |
|
|
1223 | */ |
|
|
1224 | void |
|
|
1225 | esrv_send_animation (client * ns, short anim_num) |
|
|
1226 | { |
|
|
1227 | int i; |
|
|
1228 | |
|
|
1229 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1230 | * are added in contigous order, so if the number is in the valid |
|
|
1231 | * range, it must be a valid animation. |
|
|
1232 | */ |
|
|
1233 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1234 | { |
|
|
1235 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1236 | return; |
|
|
1237 | } |
|
|
1238 | |
|
|
1239 | packet sl; |
|
|
1240 | |
|
|
1241 | sl << "anim " |
|
|
1242 | << uint16 (anim_num) |
|
|
1243 | << uint16 (0); /* flags - not used right now */ |
|
|
1244 | |
|
|
1245 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1246 | * the face itself) down to the client. |
|
|
1247 | */ |
|
|
1248 | for (i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1249 | { |
|
|
1250 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1251 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1252 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1253 | } |
|
|
1254 | |
|
|
1255 | ns->send_packet (sl); |
|
|
1256 | |
|
|
1257 | ns->anims_sent[anim_num] = 1; |
|
|
1258 | } |
|
|
1259 | |
|
|
1260 | |
1076 | |
1261 | /****************************************************************************** |
1077 | /****************************************************************************** |
1262 | * |
1078 | * |
1263 | * Start of map related commands. |
1079 | * Start of map related commands. |
1264 | * |
1080 | * |
1265 | ******************************************************************************/ |
1081 | ******************************************************************************/ |
1266 | |
1082 | |
1267 | /** |
|
|
1268 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1269 | * the face yet, we will also send it. |
|
|
1270 | */ |
|
|
1271 | static void |
|
|
1272 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1273 | { |
|
|
1274 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1275 | { |
|
|
1276 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1277 | return; |
|
|
1278 | abort (); |
|
|
1279 | } |
|
|
1280 | |
|
|
1281 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1282 | newmap->cells[x][y].count++; |
|
|
1283 | |
|
|
1284 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1285 | esrv_send_face (ns, face_num, 0); |
|
|
1286 | } |
|
|
1287 | |
|
|
1288 | struct LayerCell |
|
|
1289 | { |
|
|
1290 | uint16 xy; |
|
|
1291 | short face; |
|
|
1292 | }; |
|
|
1293 | |
|
|
1294 | struct MapLayer |
|
|
1295 | { |
|
|
1296 | int count; |
|
|
1297 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1298 | }; |
|
|
1299 | |
|
|
1300 | /** Checkes if map cells have changed */ |
|
|
1301 | static int |
|
|
1302 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
|
|
1303 | { |
|
|
1304 | int k; |
|
|
1305 | |
|
|
1306 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1307 | return 1; |
|
|
1308 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1309 | { |
|
|
1310 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1311 | { |
|
|
1312 | return 1; |
|
|
1313 | } |
|
|
1314 | } |
|
|
1315 | return 0; |
|
|
1316 | } |
|
|
1317 | |
|
|
1318 | /** |
|
|
1319 | * Basically, what this does is pack the data into layers. |
|
|
1320 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1321 | * this data into. we return the end of the data. layers is |
|
|
1322 | * how many layers of data we should back. |
|
|
1323 | */ |
|
|
1324 | static uint8 * |
|
|
1325 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1326 | { |
|
|
1327 | int x, y, k; |
|
|
1328 | int face; |
|
|
1329 | unsigned char *fcur; |
|
|
1330 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1331 | |
|
|
1332 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1333 | layers[k].count = 0; |
|
|
1334 | fcur = cur; |
|
|
1335 | for (x = 0; x < ns->mapx; x++) |
|
|
1336 | { |
|
|
1337 | for (y = 0; y < ns->mapy; y++) |
|
|
1338 | { |
|
|
1339 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1340 | continue; |
|
|
1341 | if (newmap->cells[x][y].count == 0) |
|
|
1342 | { |
|
|
1343 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1344 | cur++; |
|
|
1345 | continue; |
|
|
1346 | } |
|
|
1347 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1348 | { |
|
|
1349 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1350 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1351 | layers[k].count++; |
|
|
1352 | } |
|
|
1353 | } |
|
|
1354 | } |
|
|
1355 | /* If no data, return now. */ |
|
|
1356 | if (fcur == cur && layers[0].count == 0) |
|
|
1357 | return cur; |
|
|
1358 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1359 | cur++; |
|
|
1360 | /* First pack by layers. */ |
|
|
1361 | for (k = 0; k < numlayers; k++) |
|
|
1362 | { |
|
|
1363 | if (layers[k].count == 0) |
|
|
1364 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1365 | have anything in it either */ |
|
|
1366 | /* Pack by entries in thie layer */ |
|
|
1367 | for (x = 0; x < layers[k].count;) |
|
|
1368 | { |
|
|
1369 | fcur = cur; |
|
|
1370 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1371 | cur++; |
|
|
1372 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1373 | cur++; |
|
|
1374 | face = layers[k].lcells[x].face; |
|
|
1375 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1376 | for (y = x; y < layers[k].count; y++) |
|
|
1377 | { |
|
|
1378 | if (layers[k].lcells[y].face == face) |
|
|
1379 | { |
|
|
1380 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1381 | cur++; |
|
|
1382 | layers[k].lcells[y].face = -1; |
|
|
1383 | } |
|
|
1384 | } |
|
|
1385 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1386 | /* forward over the now redundant data */ |
|
|
1387 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1388 | x++; |
|
|
1389 | } |
|
|
1390 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1391 | } |
|
|
1392 | return cur; |
|
|
1393 | } |
|
|
1394 | |
|
|
1395 | /** Clears a map cell */ |
1083 | /** Clears a map cell */ |
1396 | static void |
1084 | static void |
1397 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1085 | map_clearcell (struct MapCell *cell, int count) |
1398 | { |
1086 | { |
1399 | cell->faces[0] = face0; |
1087 | cell->faces[0] = 0; |
1400 | cell->faces[1] = face1; |
1088 | cell->faces[1] = 0; |
1401 | cell->faces[2] = face2; |
1089 | cell->faces[2] = 0; |
|
|
1090 | cell->smooth[0] = 0; |
|
|
1091 | cell->smooth[1] = 0; |
|
|
1092 | cell->smooth[2] = 0; |
1402 | cell->count = count; |
1093 | cell->count = count; |
1403 | cell->stat_hp = 0; |
1094 | cell->stat_hp = 0; |
1404 | cell->flags = 0; |
1095 | cell->flags = 0; |
1405 | cell->player = 0; |
1096 | cell->player = 0; |
1406 | } |
1097 | } |
1407 | |
1098 | |
1408 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1409 | #define MAX_LAYERS 3 |
1099 | #define MAX_LAYERS 3 |
1410 | |
|
|
1411 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1412 | * allocating and deallocating such a block of data each time run through, |
|
|
1413 | * and saves the space of allocating this in the socket object when we only |
|
|
1414 | * need it for this cycle. If the serve is ever threaded, this needs to be |
|
|
1415 | * re-examined. |
|
|
1416 | */ |
|
|
1417 | |
|
|
1418 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1419 | |
|
|
1420 | /** |
|
|
1421 | * Returns true if any of the heads for this |
|
|
1422 | * space is set. Returns false if all are blank - this is used |
|
|
1423 | * for empty space checking. |
|
|
1424 | */ |
|
|
1425 | static inline int |
|
|
1426 | have_head (int ax, int ay) |
|
|
1427 | { |
|
|
1428 | |
|
|
1429 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1430 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1431 | return 1; |
|
|
1432 | return 0; |
|
|
1433 | } |
|
|
1434 | |
|
|
1435 | /** |
|
|
1436 | * check_head is a bit simplistic version of update_space below. |
|
|
1437 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1438 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1439 | * if needed, and returning 1. If this no data needs to get |
|
|
1440 | * sent, it returns zero. |
|
|
1441 | */ |
|
|
1442 | static int |
|
|
1443 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
|
|
1444 | { |
|
|
1445 | short face_num; |
|
|
1446 | |
|
|
1447 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1448 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1449 | else |
|
|
1450 | face_num = 0; |
|
|
1451 | |
|
|
1452 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1453 | { |
|
|
1454 | sl << uint16 (face_num); |
|
|
1455 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1456 | esrv_send_face (&ns, face_num, 0); |
|
|
1457 | |
|
|
1458 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1459 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1460 | return 1; |
|
|
1461 | } |
|
|
1462 | |
|
|
1463 | return 0; /* No change */ |
|
|
1464 | } |
|
|
1465 | |
1100 | |
1466 | /** |
1101 | /** |
1467 | * Removes the need to replicate the same code for each layer. |
1102 | * Removes the need to replicate the same code for each layer. |
1468 | * this returns true if this space is now in fact different than |
1103 | * this returns true if this space is now in fact different than |
1469 | * it was. |
1104 | * it was. |
1470 | * sl is the socklist this data is going into. |
1105 | * sl is the socklist this data is going into. |
1471 | * ns is the socket we are working on - all the info we care |
1106 | * ns is the socket we are working on - all the info we care |
1472 | * about is in this socket structure, so now need not pass the |
1107 | * about is in this socket structure, so now need not pass the |
1473 | * entire player object. |
1108 | * entire player object. |
1474 | * mx and my are map coordinate offsets for map mp |
|
|
1475 | * sx and sy are the offsets into the socket structure that |
|
|
1476 | * holds the old values. |
|
|
1477 | * layer is the layer to update, with 2 being the floor and 0 the |
1109 | * layer is the layer to update, with 2 being the floor and 0 the |
1478 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1110 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1479 | * take. Interesting to note that before this function, the map1 function |
1111 | * take. Interesting to note that before this function, the map1 function |
1480 | * numbers the spaces differently - I think this was a leftover from |
1112 | * numbers the spaces differently - I think this was a leftover from |
1481 | * the map command, where the faces stack up. Sinces that is no longer |
1113 | * the map command, where the faces stack up. Sinces that is no longer |
1482 | * the case, it seems to make more sense to have these layer values |
1114 | * the case, it seems to make more sense to have these layer values |
1483 | * actually match. |
1115 | * actually match. |
1484 | */ |
1116 | */ |
1485 | |
|
|
1486 | static int |
1117 | static int |
1487 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1118 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1488 | { |
1119 | { |
1489 | object *ob, *head; |
1120 | object *ob = ms.faces_obj [layer]; |
1490 | uint16 face_num; |
|
|
1491 | int bx, by, i; |
|
|
1492 | |
|
|
1493 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1494 | * If not, then do the normal processing. |
|
|
1495 | */ |
|
|
1496 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1497 | |
|
|
1498 | /* Check to see if this head is part of the set of objects |
|
|
1499 | * we would normally send for this space. If so, then |
|
|
1500 | * don't use the head value. We need to do the check |
|
|
1501 | * here and not when setting up the heads[] value for two reasons - |
|
|
1502 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1503 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1504 | * rather not need to do the map translation overhead. |
|
|
1505 | * 3) We need to do some extra checking to make sure that we will |
|
|
1506 | * otherwise send the image as this layer, eg, either it matches |
|
|
1507 | * the head value, or is not multipart. |
|
|
1508 | */ |
|
|
1509 | if (head && !head->more) |
|
|
1510 | { |
|
|
1511 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1512 | { |
|
|
1513 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1514 | if (!ob) |
|
|
1515 | continue; |
|
|
1516 | |
|
|
1517 | if (ob->head) |
|
|
1518 | ob = ob->head; |
|
|
1519 | |
|
|
1520 | if (ob == head) |
|
|
1521 | { |
|
|
1522 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1523 | head = NULL; |
|
|
1524 | break; |
|
|
1525 | } |
|
|
1526 | } |
|
|
1527 | } |
|
|
1528 | |
|
|
1529 | ob = head; |
|
|
1530 | if (!ob) |
|
|
1531 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1532 | |
1121 | |
1533 | /* If there is no object for this space, or if the face for the object |
1122 | /* If there is no object for this space, or if the face for the object |
1534 | * is the blank face, set the face number to zero. |
1123 | * is the blank face, set the face number to zero. |
1535 | * else if we have the stored head object for this space, that takes |
1124 | * else if we have the stored head object for this space, that takes |
1536 | * precedence over the other object for this space. |
1125 | * precedence over the other object for this space. |
1537 | * otherwise, we do special head processing |
1126 | * otherwise, we do special head processing |
1538 | */ |
1127 | */ |
1539 | if (!ob || ob->face == blank_face) |
1128 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1540 | face_num = 0; |
|
|
1541 | else if (head) |
|
|
1542 | { |
|
|
1543 | /* if this is a head that had previously been stored */ |
|
|
1544 | face_num = ob->face->number; |
|
|
1545 | } |
|
|
1546 | else |
|
|
1547 | { |
|
|
1548 | /* if the faces for the different parts of a multipart object |
|
|
1549 | * are the same, we only want to send the bottom right most |
|
|
1550 | * portion of the object. That info is in the tail_.. values |
|
|
1551 | * of the head. Note that for the head itself, ob->head will |
|
|
1552 | * be null, so we only do this block if we are working on |
|
|
1553 | * a tail piece. |
|
|
1554 | */ |
|
|
1555 | |
|
|
1556 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1557 | * this is the head object and these are set, we proceed |
|
|
1558 | * with logic to only send bottom right. Similarly, if |
|
|
1559 | * this is one of the more parts but the head has those values |
|
|
1560 | * set, we want to do the processing. There can be cases where |
|
|
1561 | * the head is not visible but one of its parts is, so we just |
|
|
1562 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1563 | * object we may want to display. |
|
|
1564 | */ |
|
|
1565 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1566 | { |
|
|
1567 | |
|
|
1568 | if (ob->head) |
|
|
1569 | head = ob->head; |
|
|
1570 | else |
|
|
1571 | head = ob; |
|
|
1572 | |
|
|
1573 | /* Basically figure out where the offset is from where we are right |
|
|
1574 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1575 | * piece is from the head, and the tail is where the tail is from the |
|
|
1576 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1577 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1578 | * will be zero, so the right thing will still happen. |
|
|
1579 | */ |
|
|
1580 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1581 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1582 | |
|
|
1583 | /* I don't think this can ever happen, but better to check for it just |
|
|
1584 | * in case. |
|
|
1585 | */ |
|
|
1586 | if (bx < sx || by < sy) |
|
|
1587 | { |
|
|
1588 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1589 | face_num = 0; |
|
|
1590 | } |
|
|
1591 | /* single part object, multipart object with non merged faces, |
|
|
1592 | * of multipart object already at lower right. |
|
|
1593 | */ |
|
|
1594 | else if (bx == sx && by == sy) |
|
|
1595 | { |
|
|
1596 | face_num = ob->face->number; |
|
|
1597 | |
|
|
1598 | /* if this face matches one stored away, clear that one away. |
|
|
1599 | * this code relies on the fact that the map1 commands |
|
|
1600 | * goes from 2 down to 0. |
|
|
1601 | */ |
|
|
1602 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1603 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1604 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1605 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1606 | } |
|
|
1607 | else |
|
|
1608 | { |
|
|
1609 | /* If this head is stored away, clear it - otherwise, |
|
|
1610 | * there can be cases where a object is on multiple layers - |
|
|
1611 | * we only want to send it once. |
|
|
1612 | */ |
|
|
1613 | face_num = head->face->number; |
|
|
1614 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1615 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1616 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1617 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1618 | |
|
|
1619 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1620 | * then find another layer. |
|
|
1621 | */ |
|
|
1622 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1623 | { |
|
|
1624 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1625 | } |
|
|
1626 | else |
|
|
1627 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1628 | { |
|
|
1629 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1630 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1631 | { |
|
|
1632 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1633 | } |
|
|
1634 | } |
|
|
1635 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1636 | } |
|
|
1637 | } |
|
|
1638 | else |
|
|
1639 | { |
|
|
1640 | /* In this case, we are already at the lower right or single part object, |
|
|
1641 | * so nothing special |
|
|
1642 | */ |
|
|
1643 | face_num = ob->face->number; |
|
|
1644 | |
|
|
1645 | /* clear out any head entries that have the same face as this one */ |
|
|
1646 | for (bx = 0; bx < layer; bx++) |
|
|
1647 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1648 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1649 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1650 | } |
|
|
1651 | } /* else not already head object or blank face */ |
|
|
1652 | |
|
|
1653 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1654 | * but there is a head on the next layer, send that instead. |
|
|
1655 | * Without this, what happens is you can get the case where the player stands |
|
|
1656 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1657 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1658 | * This tends to make stacking also work/look better. |
|
|
1659 | */ |
|
|
1660 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1661 | { |
|
|
1662 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1663 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1664 | } |
|
|
1665 | |
|
|
1666 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1667 | * we already sent for a lower layer. In that case, don't send |
|
|
1668 | * this one. |
|
|
1669 | */ |
|
|
1670 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1671 | face_num = 0; |
|
|
1672 | |
1129 | |
1673 | /* We've gotten what face we want to use for the object. Now see if |
1130 | /* We've gotten what face we want to use for the object. Now see if |
1674 | * if it has changed since we last sent it to the client. |
1131 | * if it has changed since we last sent it to the client. |
1675 | */ |
1132 | */ |
1676 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1133 | if (lastcell.faces[layer] != face_num) |
1677 | { |
1134 | { |
1678 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1135 | lastcell.faces[layer] = face_num; |
|
|
1136 | |
1679 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1137 | if (!ns.faces_sent[face_num]) |
|
|
1138 | if (ob) |
|
|
1139 | ns.send_faces (ob); |
|
|
1140 | else |
1680 | esrv_send_face (&ns, face_num, 0); |
1141 | ns.send_face (face_num); |
1681 | |
1142 | |
1682 | sl << uint16 (face_num); |
1143 | sl << uint16 (face_num); |
1683 | return 1; |
|
|
1684 | } |
|
|
1685 | |
|
|
1686 | /* Nothing changed */ |
|
|
1687 | return 0; |
|
|
1688 | } |
|
|
1689 | |
|
|
1690 | /** |
|
|
1691 | * This function is mainly a copy of update_space, |
|
|
1692 | * except it handles update of the smoothing updates, |
|
|
1693 | * not the face updates. |
|
|
1694 | * Removes the need to replicate the same code for each layer. |
|
|
1695 | * this returns true if this smooth is now in fact different |
|
|
1696 | * than it was. |
|
|
1697 | * sl is the socklist this data is going into. |
|
|
1698 | * ns is the socket we are working on - all the info we care |
|
|
1699 | * about is in this socket structure, so know need to pass the |
|
|
1700 | * entire player object. |
|
|
1701 | * mx and my are map coordinate offsets for map mp |
|
|
1702 | * sx and sy are the offsets into the socket structure that |
|
|
1703 | * holds the old values. |
|
|
1704 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1705 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1706 | * take. |
|
|
1707 | */ |
|
|
1708 | |
|
|
1709 | static inline int |
|
|
1710 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1711 | { |
|
|
1712 | object *ob; |
|
|
1713 | int smoothlevel; /* old face_num; */ |
|
|
1714 | |
|
|
1715 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1716 | |
|
|
1717 | /* If there is no object for this space, or if the face for the object |
|
|
1718 | * is the blank face, set the smoothlevel to zero. |
|
|
1719 | */ |
|
|
1720 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
|
|
1721 | smoothlevel = 0; |
|
|
1722 | else |
|
|
1723 | { |
|
|
1724 | smoothlevel = ob->smoothlevel; |
|
|
1725 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1726 | SendSmooth (&ns, ob->face->number); |
|
|
1727 | } /* else not already head object or blank face */ |
|
|
1728 | |
|
|
1729 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1730 | * if it has changed since we last sent it to the client. |
|
|
1731 | */ |
|
|
1732 | if (smoothlevel > 255) |
|
|
1733 | smoothlevel = 255; |
|
|
1734 | else if (smoothlevel < 0) |
|
|
1735 | smoothlevel = 0; |
|
|
1736 | |
|
|
1737 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1738 | { |
|
|
1739 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1740 | sl << uint8 (smoothlevel); |
|
|
1741 | return 1; |
1144 | return 1; |
1742 | } |
1145 | } |
1743 | |
1146 | |
1744 | /* Nothing changed */ |
1147 | /* Nothing changed */ |
1745 | return 0; |
1148 | return 0; |
… | |
… | |
1758 | if (ns->ext_mapinfos) |
1161 | if (ns->ext_mapinfos) |
1759 | { |
1162 | { |
1760 | if (ns->EMI_smooth) |
1163 | if (ns->EMI_smooth) |
1761 | result += 1; /*One byte for smoothlevel */ |
1164 | result += 1; /*One byte for smoothlevel */ |
1762 | } |
1165 | } |
|
|
1166 | |
1763 | return result; |
1167 | return result; |
|
|
1168 | } |
|
|
1169 | |
|
|
1170 | // prefetch (and touch) all maps within a specific distancd |
|
|
1171 | static void |
|
|
1172 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1173 | { |
|
|
1174 | map->last_access = runtime; |
|
|
1175 | |
|
|
1176 | if (--distance) |
|
|
1177 | for (int dir = 4; --dir; ) |
|
|
1178 | if (const shstr &path = map->tile_path [dir]) |
|
|
1179 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1180 | prefetch_surrounding_maps (neigh, distance); |
|
|
1181 | else |
|
|
1182 | neigh = maptile::find_async (path, map); |
|
|
1183 | } |
|
|
1184 | |
|
|
1185 | // prefetch a generous area around the player |
|
|
1186 | static void |
|
|
1187 | prefetch_surrounding_maps (object *op) |
|
|
1188 | { |
|
|
1189 | prefetch_surrounding_maps (op->map, 3); |
1764 | } |
1190 | } |
1765 | |
1191 | |
1766 | /** |
1192 | /** |
1767 | * This function uses the new map1 protocol command to send the map |
1193 | * This function uses the new map1 protocol command to send the map |
1768 | * to the client. It is necessary because the old map command supports |
1194 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1774 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1200 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1775 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1201 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1776 | * and use the other 4 bits for other informatiion. For full documentation |
1202 | * and use the other 4 bits for other informatiion. For full documentation |
1777 | * of what we send, see the doc/Protocol file. |
1203 | * of what we send, see the doc/Protocol file. |
1778 | * I will describe internally what we do: |
1204 | * I will describe internally what we do: |
1779 | * the socket->lastmap shows how the map last looked when sent to the client. |
1205 | * the ns->lastmap shows how the map last looked when sent to the client. |
1780 | * in the lastmap structure, there is a cells array, which is set to the |
1206 | * in the lastmap structure, there is a cells array, which is set to the |
1781 | * maximum viewable size (As set in config.h). |
1207 | * maximum viewable size (As set in config.h). |
1782 | * in the cells, there are faces and a count value. |
1208 | * in the cells, there are faces and a count value. |
1783 | * we use the count value to hold the darkness value. If -1, then this space |
1209 | * we use the count value to hold the darkness value. If -1, then this space |
1784 | * is not viewable. |
1210 | * is not viewable. |
… | |
… | |
1786 | * look like. |
1212 | * look like. |
1787 | */ |
1213 | */ |
1788 | void |
1214 | void |
1789 | draw_client_map1 (object *pl) |
1215 | draw_client_map1 (object *pl) |
1790 | { |
1216 | { |
1791 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1217 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1792 | sint16 nx, ny; |
1218 | sint16 nx, ny; |
1793 | int estartlen, eoldlen; |
1219 | int estartlen, eoldlen; |
1794 | uint16 mask, emask; |
|
|
1795 | uint8 eentrysize; |
1220 | uint8 eentrysize; |
1796 | uint16 ewhatstart, ewhatflag; |
1221 | uint16 ewhatstart, ewhatflag; |
1797 | uint8 extendedinfos; |
1222 | uint8 extendedinfos; |
1798 | maptile *m; |
1223 | maptile *m; |
1799 | |
1224 | |
1800 | client &socket = *pl->contr->socket; |
1225 | client &socket = *pl->contr->ns; |
|
|
1226 | |
|
|
1227 | if (!pl->active) |
|
|
1228 | return; |
1801 | |
1229 | |
1802 | check_map_change (pl->contr); |
1230 | check_map_change (pl->contr); |
|
|
1231 | prefetch_surrounding_maps (pl); |
1803 | |
1232 | |
1804 | packet sl; |
1233 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1805 | packet esl; |
1234 | packet esl; |
1806 | |
1235 | |
1807 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1808 | startlen = sl.length (); |
1236 | startlen = sl.length (); |
1809 | |
1237 | |
1810 | /*Extendedmapinfo structure initialisation */ |
1238 | /*Extendedmapinfo structure initialisation */ |
1811 | if (socket.ext_mapinfos) |
1239 | if (socket.ext_mapinfos) |
1812 | { |
1240 | { |
… | |
… | |
1831 | ewhatstart = 0; |
1259 | ewhatstart = 0; |
1832 | ewhatflag = 0; |
1260 | ewhatflag = 0; |
1833 | estartlen = 0; |
1261 | estartlen = 0; |
1834 | } |
1262 | } |
1835 | |
1263 | |
1836 | /* Init data to zero */ |
|
|
1837 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1838 | |
|
|
1839 | /* x,y are the real map locations. ax, ay are viewport relative |
1264 | /* x,y are the real map locations. ax, ay are viewport relative |
1840 | * locations. |
1265 | * locations. |
1841 | */ |
1266 | */ |
1842 | ay = 0; |
1267 | ay = 0; |
1843 | |
1268 | |
… | |
… | |
1845 | * but that started to get a bit messy to look at. |
1270 | * but that started to get a bit messy to look at. |
1846 | */ |
1271 | */ |
1847 | max_x = pl->x + (socket.mapx + 1) / 2; |
1272 | max_x = pl->x + (socket.mapx + 1) / 2; |
1848 | max_y = pl->y + (socket.mapy + 1) / 2; |
1273 | max_y = pl->y + (socket.mapy + 1) / 2; |
1849 | |
1274 | |
1850 | if (socket.mapmode == Map1aCmd) |
1275 | maptile *plmap = pl->map; |
1851 | { |
|
|
1852 | max_x += MAX_HEAD_OFFSET; |
|
|
1853 | max_y += MAX_HEAD_OFFSET; |
|
|
1854 | } |
|
|
1855 | |
1276 | |
1856 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1277 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1857 | { |
1278 | { |
1858 | ax = 0; |
1279 | ax = 0; |
1859 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1280 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1860 | { |
1281 | { |
1861 | |
1282 | int emask, mask; |
1862 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1283 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1863 | |
1284 | |
1864 | /* If this space is out of the normal viewable area, we only check |
|
|
1865 | * the heads value ax or ay will only be greater than what |
|
|
1866 | * the client wants if using the map1a command - this is because |
|
|
1867 | * if the map1a command is not used, max_x and max_y will be |
|
|
1868 | * set to lower values. |
|
|
1869 | */ |
|
|
1870 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1871 | { |
|
|
1872 | int i, got_one; |
|
|
1873 | |
|
|
1874 | oldlen = sl.length (); |
|
|
1875 | |
|
|
1876 | sl << uint16 (mask); |
|
|
1877 | |
|
|
1878 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1879 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1880 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1881 | |
|
|
1882 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1883 | * actually need to send that - just the coordinates |
|
|
1884 | * with no faces tells the client to blank out the |
|
|
1885 | * space. |
|
|
1886 | */ |
|
|
1887 | got_one = 0; |
|
|
1888 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1889 | if (sl[i]) |
|
|
1890 | got_one = 1; |
|
|
1891 | |
|
|
1892 | if (got_one && (mask & 0xf)) |
|
|
1893 | sl[oldlen + 1] = mask & 0xff; |
|
|
1894 | else |
|
|
1895 | { /*either all faces blank, either no face at all */ |
|
|
1896 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1897 | sl.reset (oldlen + 2); |
|
|
1898 | else |
|
|
1899 | sl.reset (oldlen); |
|
|
1900 | } |
|
|
1901 | |
|
|
1902 | /*What concerns extendinfos, nothing to be done for now |
|
|
1903 | * (perhaps effects layer later) |
|
|
1904 | */ |
|
|
1905 | continue; /* don't do processing below */ |
|
|
1906 | } |
|
|
1907 | |
|
|
1908 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1285 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1909 | |
|
|
1910 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1911 | |
1286 | |
1912 | /* If the coordinates are not valid, or it is too dark to see, |
1287 | /* If the coordinates are not valid, or it is too dark to see, |
1913 | * we tell the client as such |
1288 | * we tell the client as such |
1914 | */ |
1289 | */ |
1915 | nx = x; |
1290 | nx = x; |
1916 | ny = y; |
1291 | ny = y; |
1917 | m = get_map_from_coord (pl->map, &nx, &ny); |
1292 | m = get_map_from_coord (plmap, &nx, &ny); |
1918 | |
1293 | |
1919 | if (!m) |
1294 | if (!m) |
1920 | { |
1295 | { |
1921 | /* space is out of map. Update space and clear values |
1296 | /* space is out of map. Update space and clear values |
1922 | * if this hasn't already been done. If the space is out |
1297 | * if this hasn't already been done. If the space is out |
1923 | * of the map, it shouldn't have a head |
1298 | * of the map, it shouldn't have a head |
1924 | */ |
1299 | */ |
1925 | if (lastcell.count != -1) |
1300 | if (lastcell.count != -1) |
1926 | { |
1301 | { |
1927 | sl << uint16 (mask); |
1302 | sl << uint16 (mask); |
1928 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1303 | map_clearcell (&lastcell, -1); |
1929 | } |
1304 | } |
|
|
1305 | |
|
|
1306 | continue; |
1930 | } |
1307 | } |
|
|
1308 | |
|
|
1309 | m->touch (); |
|
|
1310 | |
|
|
1311 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1312 | |
1931 | else if (d > 3) |
1313 | if (d > 3) |
1932 | { |
1314 | { |
|
|
1315 | |
1933 | int need_send = 0, count; |
1316 | int need_send = 0, count; |
1934 | |
1317 | |
1935 | /* This block deals with spaces that are not visible for whatever |
1318 | /* This block deals with spaces that are not visible for whatever |
1936 | * reason. Still may need to send the head for this space. |
1319 | * reason. Still may need to send the head for this space. |
1937 | */ |
1320 | */ |
1938 | |
1321 | |
1939 | oldlen = sl.length (); |
1322 | oldlen = sl.length (); |
1940 | |
1323 | |
1941 | sl << uint16 (mask); |
1324 | sl << uint16 (mask); |
… | |
… | |
1943 | if (lastcell.count != -1) |
1326 | if (lastcell.count != -1) |
1944 | need_send = 1; |
1327 | need_send = 1; |
1945 | |
1328 | |
1946 | count = -1; |
1329 | count = -1; |
1947 | |
1330 | |
1948 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1949 | { |
|
|
1950 | /* Now check to see if any heads need to be sent */ |
|
|
1951 | |
|
|
1952 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1953 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1954 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1955 | |
|
|
1956 | lastcell.count = count; |
|
|
1957 | } |
|
|
1958 | else |
|
|
1959 | { |
|
|
1960 | /* properly clear a previously sent big face */ |
1331 | /* properly clear a previously sent big face */ |
1961 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1332 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1962 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1333 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1963 | need_send = 1; |
1334 | need_send = 1; |
1964 | |
1335 | |
1965 | map_clearcell (&lastcell, 0, 0, 0, count); |
1336 | map_clearcell (&lastcell, count); |
1966 | } |
|
|
1967 | |
1337 | |
1968 | if ((mask & 0xf) || need_send) |
1338 | if ((mask & 0xf) || need_send) |
1969 | sl[oldlen + 1] = mask & 0xff; |
1339 | sl[oldlen + 1] = mask & 0xff; |
1970 | else |
1340 | else |
1971 | sl.reset (oldlen); |
1341 | sl.reset (oldlen); |
1972 | } |
1342 | } |
1973 | else |
1343 | else |
1974 | { |
1344 | { |
1975 | /* In this block, the space is visible or there are head objects |
1345 | /* In this block, the space is visible. |
1976 | * we need to send. |
|
|
1977 | */ |
1346 | */ |
1978 | |
1347 | |
1979 | /* Rather than try to figure out what everything that we might |
1348 | /* Rather than try to figure out what everything that we might |
1980 | * need to send is, then form the packet after that, |
1349 | * need to send is, then form the packet after that, |
1981 | * we presume that we will in fact form a packet, and update |
1350 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1984 | * is done. |
1353 | * is done. |
1985 | * I think this is simpler than doing a bunch of checks to see |
1354 | * I think this is simpler than doing a bunch of checks to see |
1986 | * what if anything we need to send, setting the bits, then |
1355 | * what if anything we need to send, setting the bits, then |
1987 | * doing those checks again to add the real data. |
1356 | * doing those checks again to add the real data. |
1988 | */ |
1357 | */ |
1989 | oldlen = sl.length (); |
1358 | oldlen = sl.length (); |
1990 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1991 | eoldlen = esl.length (); |
1359 | eoldlen = esl.length (); |
1992 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1360 | |
1993 | sl << uint16 (mask); |
1361 | sl << uint16 (mask); |
1994 | |
|
|
1995 | if (socket.ext_mapinfos) |
|
|
1996 | esl << uint16 (emask); |
|
|
1997 | |
1362 | |
1998 | unsigned char dummy; |
1363 | unsigned char dummy; |
1999 | unsigned char *last_ext = &dummy; |
1364 | unsigned char *last_ext = &dummy; |
2000 | |
1365 | |
2001 | /* Darkness changed */ |
1366 | /* Darkness changed */ |
… | |
… | |
2013 | sl << uint8 (255 - 64 * d); |
1378 | sl << uint8 (255 - 64 * d); |
2014 | } |
1379 | } |
2015 | |
1380 | |
2016 | lastcell.count = d; |
1381 | lastcell.count = d; |
2017 | |
1382 | |
|
|
1383 | mapspace &ms = m->at (nx, ny); |
|
|
1384 | |
2018 | if (socket.extmap) |
1385 | if (socket.extmap) |
2019 | { |
1386 | { |
2020 | uint8 stat_hp = 0; |
1387 | uint8 stat_hp = 0; |
2021 | uint8 stat_width = 0; |
1388 | uint8 stat_width = 0; |
2022 | uint8 flags = 0; |
1389 | uint8 flags = 0; |
2023 | UUID player = 0; |
1390 | UUID player = 0; |
2024 | |
1391 | |
2025 | // send hp information, if applicable |
1392 | // send hp information, if applicable |
2026 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1393 | if (object *op = ms.faces_obj [0]) |
2027 | { |
1394 | { |
2028 | if (op->head || op->invisible) |
1395 | if (op->head || op->invisible) |
2029 | ; // do not show |
1396 | ; // do not show |
2030 | else if (op->type == PLAYER |
1397 | else if (op->type == PLAYER |
2031 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1398 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
… | |
… | |
2085 | sl << uint8 (8) << uint8 (flags); |
1452 | sl << uint8 (8) << uint8 (flags); |
2086 | } |
1453 | } |
2087 | } |
1454 | } |
2088 | |
1455 | |
2089 | /* Floor face */ |
1456 | /* Floor face */ |
2090 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1457 | if (update_space (sl, socket, ms, lastcell, 2)) |
2091 | mask |= 0x4; |
1458 | mask |= 0x4; |
2092 | |
1459 | |
2093 | if (socket.EMI_smooth) |
|
|
2094 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
2095 | emask |= 0x4; |
|
|
2096 | |
|
|
2097 | /* Middle face */ |
1460 | /* Middle face */ |
2098 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1461 | if (update_space (sl, socket, ms, lastcell, 1)) |
2099 | mask |= 0x2; |
1462 | mask |= 0x2; |
2100 | |
1463 | |
2101 | if (socket.EMI_smooth) |
1464 | if (ms.player () == pl |
2102 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1465 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
2103 | emask |= 0x2; |
|
|
2104 | |
|
|
2105 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2106 | { |
1466 | { |
|
|
1467 | // force player to be visible to himself if invisible |
2107 | if (lastcell.faces[0] != pl->face->number) |
1468 | if (lastcell.faces[0] != pl->face) |
2108 | { |
1469 | { |
2109 | lastcell.faces[0] = pl->face->number; |
1470 | lastcell.faces[0] = pl->face; |
|
|
1471 | |
2110 | mask |= 0x1; |
1472 | mask |= 0x1; |
2111 | |
|
|
2112 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
|
|
2113 | esrv_send_face (&socket, pl->face->number, 0); |
|
|
2114 | |
|
|
2115 | sl << uint16 (pl->face->number); |
1473 | sl << uint16 (pl->face); |
|
|
1474 | |
|
|
1475 | socket.send_faces (pl); |
2116 | } |
1476 | } |
2117 | } |
1477 | } |
2118 | else |
|
|
2119 | { |
|
|
2120 | /* Top face */ |
1478 | /* Top face */ |
2121 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1479 | else if (update_space (sl, socket, ms, lastcell, 0)) |
2122 | mask |= 0x1; |
1480 | mask |= 0x1; |
2123 | |
|
|
2124 | if (socket.EMI_smooth) |
|
|
2125 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
2126 | emask |= 0x1; |
|
|
2127 | } |
1481 | |
2128 | |
1482 | |
2129 | /* Check to see if we are in fact sending anything for this |
1483 | /* Check to see if we are in fact sending anything for this |
2130 | * space by checking the mask. If so, update the mask. |
1484 | * space by checking the mask. If so, update the mask. |
2131 | * if not, reset the len to that from before adding the mask |
1485 | * if not, reset the len to that from before adding the mask |
2132 | * value, so we don't send those bits. |
1486 | * value, so we don't send those bits. |
… | |
… | |
2134 | if (mask & 0xf) |
1488 | if (mask & 0xf) |
2135 | sl[oldlen + 1] = mask & 0xff; |
1489 | sl[oldlen + 1] = mask & 0xff; |
2136 | else |
1490 | else |
2137 | sl.reset (oldlen); |
1491 | sl.reset (oldlen); |
2138 | |
1492 | |
|
|
1493 | if (socket.ext_mapinfos) |
|
|
1494 | esl << uint16 (emask); |
|
|
1495 | |
|
|
1496 | if (socket.EMI_smooth) |
|
|
1497 | { |
|
|
1498 | for (int layer = 2+1; layer--; ) |
|
|
1499 | { |
|
|
1500 | object *ob = ms.faces_obj [layer]; |
|
|
1501 | |
|
|
1502 | // If there is no object for this space, or if the face for the object |
|
|
1503 | // is the blank face, set the smoothlevel to zero. |
|
|
1504 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1505 | |
|
|
1506 | // We've gotten what face we want to use for the object. Now see if |
|
|
1507 | // if it has changed since we last sent it to the client. |
|
|
1508 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1509 | { |
|
|
1510 | lastcell.smooth[layer] = smoothlevel; |
|
|
1511 | esl << uint8 (smoothlevel); |
|
|
1512 | emask |= 1 << layer; |
|
|
1513 | } |
|
|
1514 | } |
|
|
1515 | |
2139 | if (emask & 0xf) |
1516 | if (emask & 0xf) |
2140 | esl[eoldlen + 1] = emask & 0xff; |
1517 | esl[eoldlen + 1] = emask & 0xff; |
2141 | else |
1518 | else |
2142 | esl.reset (eoldlen); |
1519 | esl.reset (eoldlen); |
|
|
1520 | } |
2143 | } /* else this is a viewable space */ |
1521 | } /* else this is a viewable space */ |
2144 | } /* for x loop */ |
1522 | } /* for x loop */ |
2145 | } /* for y loop */ |
1523 | } /* for y loop */ |
2146 | |
1524 | |
2147 | /* Verify that we in fact do need to send this */ |
1525 | /* Verify that we in fact do need to send this */ |
… | |
… | |
2150 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1528 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2151 | { |
1529 | { |
2152 | /* No map data will follow, so don't say the client |
1530 | /* No map data will follow, so don't say the client |
2153 | * it doesn't need draw! |
1531 | * it doesn't need draw! |
2154 | */ |
1532 | */ |
2155 | ewhatflag &= (~EMI_NOREDRAW); |
1533 | ewhatflag &= ~EMI_NOREDRAW; |
2156 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1534 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2157 | } |
1535 | } |
2158 | |
1536 | |
2159 | if (esl.length () > estartlen) |
1537 | if (esl.length () > estartlen) |
2160 | socket.send_packet (esl); |
1538 | socket.send_packet (esl); |
… | |
… | |
2172 | */ |
1550 | */ |
2173 | void |
1551 | void |
2174 | draw_client_map (object *pl) |
1552 | draw_client_map (object *pl) |
2175 | { |
1553 | { |
2176 | int i, j; |
1554 | int i, j; |
2177 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1555 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
2178 | New_Face *face, *floor; |
|
|
2179 | New_Face *floor2; |
|
|
2180 | int d, mflags; |
1556 | int mflags; |
2181 | struct Map newmap; |
1557 | struct Map newmap; |
2182 | maptile *m, *pm; |
1558 | maptile *m, *pm; |
2183 | |
1559 | |
2184 | if (pl->type != PLAYER) |
1560 | if (pl->type != PLAYER) |
2185 | { |
1561 | { |
… | |
… | |
2196 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1572 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2197 | return; |
1573 | return; |
2198 | |
1574 | |
2199 | memset (&newmap, 0, sizeof (struct Map)); |
1575 | memset (&newmap, 0, sizeof (struct Map)); |
2200 | |
1576 | |
2201 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1577 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2202 | { |
|
|
2203 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1578 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2204 | { |
1579 | { |
2205 | ax = i; |
1580 | ax = i; |
2206 | ay = j; |
1581 | ay = j; |
2207 | m = pm; |
1582 | m = pm; |
2208 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1583 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1584 | |
2209 | if (mflags & P_OUT_OF_MAP) |
1585 | if (mflags & P_OUT_OF_MAP) |
2210 | continue; |
1586 | continue; |
2211 | if (mflags & P_NEED_UPDATE) |
1587 | |
2212 | update_position (m, ax, ay); |
|
|
2213 | /* If a map is visible to the player, we don't want to swap it out |
1588 | /* If a map is visible to the player, we don't want to swap it out |
2214 | * just to reload it. This should really call something like |
1589 | * just to reload it. This should really call something like |
2215 | * swap_map, but this is much more efficient and 'good enough' |
1590 | * swap_map, but this is much more efficient and 'good enough' |
2216 | */ |
1591 | */ |
2217 | if (mflags & P_NEW_MAP) |
1592 | if (mflags & P_NEW_MAP) |
2218 | m->timeout = 50; |
1593 | m->timeout = 50; |
2219 | } |
1594 | } |
2220 | } |
1595 | |
2221 | /* do LOS after calls to update_position */ |
1596 | /* do LOS after calls to update_position */ |
2222 | if (pl->contr->do_los) |
1597 | if (pl->contr->do_los) |
2223 | { |
1598 | { |
2224 | update_los (pl); |
1599 | update_los (pl); |
2225 | pl->contr->do_los = 0; |
1600 | pl->contr->do_los = 0; |
… | |
… | |
2240 | |
1615 | |
2241 | /*****************************************************************************/ |
1616 | /*****************************************************************************/ |
2242 | void |
1617 | void |
2243 | send_plugin_custom_message (object *pl, char *buf) |
1618 | send_plugin_custom_message (object *pl, char *buf) |
2244 | { |
1619 | { |
2245 | pl->contr->socket->send_packet (buf); |
1620 | pl->contr->ns->send_packet (buf); |
2246 | } |
1621 | } |
2247 | |
1622 | |
2248 | /** |
1623 | /** |
2249 | * This sends the skill number to name mapping. We ignore |
1624 | * This sends the skill number to name mapping. We ignore |
2250 | * the params - we always send the same info no matter what. |
1625 | * the params - we always send the same info no matter what. |
… | |
… | |
2295 | * it then sends an updspell packet for each spell that has changed in this way |
1670 | * it then sends an updspell packet for each spell that has changed in this way |
2296 | */ |
1671 | */ |
2297 | void |
1672 | void |
2298 | esrv_update_spells (player *pl) |
1673 | esrv_update_spells (player *pl) |
2299 | { |
1674 | { |
|
|
1675 | if (!pl->ns) |
|
|
1676 | return; |
|
|
1677 | |
2300 | if (!pl->socket->monitor_spells) |
1678 | if (!pl->ns->monitor_spells) |
2301 | return; |
1679 | return; |
2302 | |
1680 | |
2303 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1681 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2304 | { |
1682 | { |
2305 | if (spell->type == SPELL) |
1683 | if (spell->type == SPELL) |
… | |
… | |
2335 | |
1713 | |
2336 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1714 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2337 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1715 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2338 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1716 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2339 | |
1717 | |
2340 | pl->socket->send_packet (sl); |
1718 | pl->ns->send_packet (sl); |
2341 | } |
1719 | } |
2342 | } |
1720 | } |
2343 | } |
1721 | } |
2344 | } |
1722 | } |
2345 | |
1723 | |
2346 | void |
1724 | void |
2347 | esrv_remove_spell (player *pl, object *spell) |
1725 | esrv_remove_spell (player *pl, object *spell) |
2348 | { |
1726 | { |
2349 | if (!pl->socket->monitor_spells) |
1727 | if (!pl->ns->monitor_spells) |
2350 | return; |
1728 | return; |
2351 | |
1729 | |
2352 | if (!pl || !spell || spell->env != pl->ob) |
1730 | if (!pl || !spell || spell->env != pl->ob) |
2353 | { |
1731 | { |
2354 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
1732 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2355 | return; |
1733 | return; |
2356 | } |
1734 | } |
2357 | |
1735 | |
2358 | packet sl; |
1736 | packet sl ("delspell"); |
2359 | |
1737 | |
2360 | sl << "delspell " |
|
|
2361 | << uint32 (spell->count); |
1738 | sl << uint32 (spell->count); |
2362 | |
1739 | |
2363 | pl->socket->send_packet (sl); |
1740 | pl->ns->send_packet (sl); |
2364 | } |
1741 | } |
2365 | |
1742 | |
2366 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1743 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2367 | static void |
1744 | static void |
2368 | append_spell (player *pl, packet &sl, object *spell) |
1745 | append_spell (player *pl, packet &sl, object *spell) |
2369 | { |
1746 | { |
2370 | int len, i, skill = 0; |
1747 | int i, skill = 0; |
2371 | |
1748 | |
2372 | if (!(spell->name)) |
1749 | if (!(spell->name)) |
2373 | { |
1750 | { |
2374 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1751 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2375 | return; |
1752 | return; |
… | |
… | |
2387 | if (!strcmp (spell->skill, skill_names[i])) |
1764 | if (!strcmp (spell->skill, skill_names[i])) |
2388 | { |
1765 | { |
2389 | skill = i + CS_STAT_SKILLINFO; |
1766 | skill = i + CS_STAT_SKILLINFO; |
2390 | break; |
1767 | break; |
2391 | } |
1768 | } |
|
|
1769 | } |
|
|
1770 | |
|
|
1771 | // spells better have a face |
|
|
1772 | if (!spell->face) |
|
|
1773 | { |
|
|
1774 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1775 | spell->face = face_find ("burnout.x11", blank_face); |
2392 | } |
1776 | } |
2393 | |
1777 | |
2394 | /* send the current values */ |
1778 | /* send the current values */ |
2395 | sl << uint32 (spell->count) |
1779 | sl << uint32 (spell->count) |
2396 | << uint16 (spell->level) |
1780 | << uint16 (spell->level) |
… | |
… | |
2398 | << uint16 (spell->last_sp) |
1782 | << uint16 (spell->last_sp) |
2399 | << uint16 (spell->last_grace) |
1783 | << uint16 (spell->last_grace) |
2400 | << uint16 (spell->last_eat) |
1784 | << uint16 (spell->last_eat) |
2401 | << uint8 (skill) |
1785 | << uint8 (skill) |
2402 | << uint32 (spell->path_attuned) |
1786 | << uint32 (spell->path_attuned) |
2403 | << uint32 (spell->face ? spell->face->number : 0) |
1787 | << uint32 (spell->face) |
2404 | << data8 (spell->name) |
1788 | << data8 (spell->name) |
2405 | << data16 (spell->msg); |
1789 | << data16 (spell->msg); |
2406 | } |
1790 | } |
2407 | |
1791 | |
2408 | /** |
1792 | /** |
… | |
… | |
2416 | { |
1800 | { |
2417 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
1801 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2418 | return; |
1802 | return; |
2419 | } |
1803 | } |
2420 | |
1804 | |
2421 | if (!pl->socket->monitor_spells) |
1805 | if (!pl->ns->monitor_spells) |
2422 | return; |
1806 | return; |
2423 | |
1807 | |
2424 | packet sl; |
1808 | packet sl ("addspell"); |
2425 | |
|
|
2426 | sl << "addspell "; |
|
|
2427 | |
1809 | |
2428 | if (!spell) |
1810 | if (!spell) |
2429 | { |
1811 | { |
2430 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1812 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2431 | { |
1813 | { |
2432 | /* were we to simply keep appending data here, we could exceed |
1814 | /* were we to simply keep appending data here, we could exceed |
2433 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1815 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2434 | * append_spells will always append 19 data bytes, plus 4 length |
1816 | * append_spells will always append 19 data bytes, plus 4 length |
2435 | * bytes and 3 strings (because that is the spec) so we need to |
1817 | * bytes and 3 strings (because that is the spec) so we need to |
… | |
… | |
2445 | if (spell->type != SPELL) |
1827 | if (spell->type != SPELL) |
2446 | continue; |
1828 | continue; |
2447 | |
1829 | |
2448 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1830 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2449 | { |
1831 | { |
2450 | pl->socket->send_packet (sl); |
1832 | pl->ns->send_packet (sl); |
2451 | |
1833 | |
2452 | sl.reset (); |
1834 | sl.reset (); |
2453 | sl << "addspell "; |
1835 | sl << "addspell "; |
2454 | } |
1836 | } |
2455 | |
1837 | |
… | |
… | |
2469 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1851 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2470 | fatal (0); |
1852 | fatal (0); |
2471 | } |
1853 | } |
2472 | |
1854 | |
2473 | /* finally, we can send the packet */ |
1855 | /* finally, we can send the packet */ |
2474 | pl->socket->send_packet (sl); |
1856 | pl->ns->send_packet (sl); |
2475 | } |
1857 | } |
2476 | |
1858 | |