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 | */ |
41 | */ |
44 | |
42 | |
45 | #include <global.h> |
43 | #include <global.h> |
46 | #include <sproto.h> |
44 | #include <sproto.h> |
47 | |
45 | |
… | |
… | |
100 | * that much difference in bandwidth. |
98 | * that much difference in bandwidth. |
101 | */ |
99 | */ |
102 | mx = ns->mapx; |
100 | mx = ns->mapx; |
103 | my = ns->mapy; |
101 | my = ns->mapy; |
104 | |
102 | |
105 | if (ns->mapmode == Map1aCmd) |
|
|
106 | { |
|
|
107 | mx += MAX_HEAD_OFFSET; |
|
|
108 | my += MAX_HEAD_OFFSET; |
|
|
109 | } |
|
|
110 | |
|
|
111 | /* 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 |
112 | * (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, |
113 | * if the destination x or y coordinate is outside the viewable |
105 | * if the destination x or y coordinate is outside the viewable |
114 | * area, we clear the values - otherwise, the old values |
106 | * area, we clear the values - otherwise, the old values |
115 | * 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. |
… | |
… | |
138 | } |
130 | } |
139 | |
131 | |
140 | static void |
132 | static void |
141 | clear_map (player *pl) |
133 | clear_map (player *pl) |
142 | { |
134 | { |
143 | memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
144 | |
136 | |
145 | if (pl->socket->newmapcmd == 1) |
137 | if (pl->ns->newmapcmd == 1) |
146 | pl->socket->send_packet ("newmap"); |
138 | pl->ns->send_packet ("newmap"); |
147 | |
139 | |
148 | pl->socket->floorbox_reset (); |
140 | pl->ns->floorbox_reset (); |
149 | } |
141 | } |
150 | |
142 | |
151 | /** check for map change and send new map data */ |
143 | /** check for map/region change and send new map data */ |
152 | static void |
144 | static void |
153 | check_map_change (player *pl) |
145 | check_map_change (player *pl) |
154 | { |
146 | { |
155 | client &socket = *pl->socket; |
147 | client &socket = *pl->ns; |
156 | object *ob = pl->ob; |
148 | object *ob = pl->ob; |
157 | char buf[MAX_BUF]; /* eauugggh */ |
149 | char buf[MAX_BUF]; /* eauugggh */ |
158 | |
150 | |
159 | if (socket.current_map != ob->map) |
151 | if (socket.current_map != ob->map) |
160 | { |
152 | { |
… | |
… | |
176 | flags |= 4; |
168 | flags |= 4; |
177 | if (ob->map->tile_path[3]) |
169 | if (ob->map->tile_path[3]) |
178 | flags |= 8; |
170 | flags |= 8; |
179 | |
171 | |
180 | 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", |
181 | 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); |
182 | } |
174 | } |
183 | else |
175 | else |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
176 | snprintf (buf, MAX_BUF, "mapinfo current"); |
185 | |
177 | |
186 | socket.send_packet (buf); |
178 | socket.send_packet (buf); |
… | |
… | |
200 | } |
192 | } |
201 | } |
193 | } |
202 | |
194 | |
203 | socket.current_x = ob->x; |
195 | socket.current_x = ob->x; |
204 | 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 | } |
205 | } |
204 | } |
206 | |
205 | |
207 | /** |
206 | /** |
208 | * RequestInfo is sort of a meta command. There is some specific |
207 | * RequestInfo is sort of a meta command. There is some specific |
209 | * request of information, but we call other functions to provide |
208 | * request of information, but we call other functions to provide |
… | |
… | |
280 | buf += 8; |
279 | buf += 8; |
281 | |
280 | |
282 | // initial map and its origin |
281 | // initial map and its origin |
283 | maptile *map = pl->ob->map; |
282 | maptile *map = pl->ob->map; |
284 | sint16 dx, dy; |
283 | sint16 dx, dy; |
285 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
284 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
286 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
285 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
287 | int max_distance = 8; // limit maximum path length to something generous |
286 | int max_distance = 8; // limit maximum path length to something generous |
288 | |
287 | |
289 | while (*buf && map && max_distance) |
288 | while (*buf && map && max_distance) |
290 | { |
289 | { |
291 | int dir = *buf++; |
290 | int dir = *buf++; |
292 | |
291 | |
293 | switch (dir) |
292 | switch (dir) |
294 | { |
293 | { |
295 | case '1': |
294 | case '1': |
296 | dx = 0; |
295 | dx = 0; |
297 | dy = -1; |
296 | dy = -1; |
298 | map = get_map_from_coord (map, &dx, &dy); |
297 | map = map->xy_find (dx, dy); |
299 | map && (mapy -= map->height); |
298 | map && (mapy -= map->height); |
300 | break; |
299 | break; |
301 | case '2': |
300 | case '2': |
302 | mapx += map->width; |
301 | mapx += map->width; |
303 | dx = map->width; |
302 | dx = map->width; |
304 | dy = 0; |
303 | dy = 0; |
305 | map = get_map_from_coord (map, &dx, &dy); |
304 | map = map->xy_find (dx, dy); |
306 | break; |
305 | break; |
307 | case '3': |
306 | case '3': |
308 | mapy += map->height; |
307 | mapy += map->height; |
309 | dx = 0; |
308 | dx = 0; |
310 | dy = map->height; |
309 | dy = map->height; |
311 | map = get_map_from_coord (map, &dx, &dy); |
310 | map = map->xy_find (dx, dy); |
312 | break; |
311 | break; |
313 | case '4': |
312 | case '4': |
314 | dx = -1; |
313 | dx = -1; |
315 | dy = 0; |
314 | dy = 0; |
316 | map = get_map_from_coord (map, &dx, &dy); |
315 | map = map->xy_find (dx, dy); |
317 | map && (mapx -= map->width); |
316 | map && (mapx -= map->width); |
318 | break; |
317 | break; |
319 | } |
318 | } |
320 | |
319 | |
321 | --max_distance; |
320 | --max_distance; |
322 | } |
321 | } |
323 | |
322 | |
… | |
… | |
334 | if (map->tile_path[2]) |
333 | if (map->tile_path[2]) |
335 | flags |= 4; |
334 | flags |= 4; |
336 | if (map->tile_path[3]) |
335 | if (map->tile_path[3]) |
337 | flags |= 8; |
336 | flags |= 8; |
338 | |
337 | |
339 | 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); |
340 | } |
339 | } |
341 | else |
340 | else |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
341 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | } |
342 | } |
344 | else |
343 | else |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
344 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | |
345 | |
347 | pl->socket->send_packet (bigbuf); |
346 | pl->ns->send_packet (bigbuf); |
348 | } |
347 | } |
349 | |
348 | |
350 | /** This is the Setup cmd - easy first implementation */ |
349 | /** This is the Setup cmd - easy first implementation */ |
351 | void |
350 | void |
352 | SetUp (char *buf, int len, client * ns) |
351 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
399 | { |
398 | { |
400 | ns->sound = atoi (param); |
399 | ns->sound = atoi (param); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
400 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
402 | } |
401 | } |
403 | else if (!strcmp (cmd, "exp64")) |
402 | else if (!strcmp (cmd, "exp64")) |
404 | { |
|
|
405 | ns->exp64 = atoi (param); |
|
|
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
403 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
407 | } |
|
|
408 | else if (!strcmp (cmd, "spellmon")) |
404 | else if (!strcmp (cmd, "spellmon")) |
409 | { |
405 | { |
410 | ns->monitor_spells = atoi (param); |
406 | ns->monitor_spells = atoi (param); |
411 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
407 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
412 | } |
408 | } |
… | |
… | |
435 | } |
431 | } |
436 | else if (!strcmp (cmd, "newmapcmd")) |
432 | else if (!strcmp (cmd, "newmapcmd")) |
437 | { |
433 | { |
438 | ns->newmapcmd = atoi (param); |
434 | ns->newmapcmd = atoi (param); |
439 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
435 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
440 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
441 | // ns->plugincmd = atoi(param); |
|
|
442 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
443 | } |
436 | } |
444 | else if (!strcmp (cmd, "mapinfocmd")) |
437 | else if (!strcmp (cmd, "mapinfocmd")) |
445 | { |
438 | { |
446 | ns->mapinfocmd = atoi (param); |
439 | ns->mapinfocmd = atoi (param); |
447 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
440 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
… | |
… | |
466 | char tmpbuf[20]; |
459 | char tmpbuf[20]; |
467 | int q = atoi (param); |
460 | int q = atoi (param); |
468 | |
461 | |
469 | if (is_valid_faceset (q)) |
462 | if (is_valid_faceset (q)) |
470 | ns->faceset = q; |
463 | ns->faceset = q; |
|
|
464 | |
471 | sprintf (tmpbuf, "%d", ns->faceset); |
465 | sprintf (tmpbuf, "%d", ns->faceset); |
472 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
466 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
473 | /* if the client is using faceset, it knows about image2 command */ |
467 | /* if the client is using faceset, it knows about image2 command */ |
474 | ns->image2 = 1; |
468 | ns->image2 = 1; |
475 | } |
469 | } |
… | |
… | |
503 | if (*cp == 'x' || *cp == 'X') |
497 | if (*cp == 'x' || *cp == 'X') |
504 | { |
498 | { |
505 | y = atoi (cp + 1); |
499 | y = atoi (cp + 1); |
506 | break; |
500 | break; |
507 | } |
501 | } |
|
|
502 | |
508 | 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) |
509 | { |
504 | { |
510 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
505 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
511 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
506 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
512 | } |
507 | } |
… | |
… | |
567 | * This is what takes care of it. We tell the client how things worked out. |
562 | * This is what takes care of it. We tell the client how things worked out. |
568 | * I am not sure if this file is the best place for this function. however, |
563 | * I am not sure if this file is the best place for this function. however, |
569 | * 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. |
570 | */ |
565 | */ |
571 | void |
566 | void |
572 | AddMeCmd (char *buf, int len, client * ns) |
567 | AddMeCmd (char *buf, int len, client *ns) |
573 | { |
568 | { |
574 | if (ns->status != Ns_Add || add_player (ns)) |
569 | // face caching is mandatory |
575 | ns->send_packet ("addme_failed"); |
570 | if (!ns->facecache) |
|
|
571 | { |
|
|
572 | ns->send_drawinfo ( |
|
|
573 | "\n" |
|
|
574 | "\n" |
|
|
575 | "***\n" |
|
|
576 | "*** WARNING:\n" |
|
|
577 | "*** Your client does not support face/image caching,\n" |
|
|
578 | "*** or it has been disabled. Face caching is mandatory\n" |
|
|
579 | "*** so please enable it or use a newer client.\n" |
|
|
580 | "***\n" |
|
|
581 | "*** Look at your client preferences:\n" |
|
|
582 | "***\n" |
|
|
583 | "*** CFPlus: all known versions automatically enable the facecache.\n" |
|
|
584 | "*** cfclient: use the -cache commandline option.\n" |
|
|
585 | "*** cfclient: map will not redraw automatically (bug).\n" |
|
|
586 | "*** gcfclient: use -cache commandline option, or enable\n" |
|
|
587 | "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n" |
|
|
588 | "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n" |
|
|
589 | "***\n" |
|
|
590 | "***\n", |
|
|
591 | NDI_RED |
|
|
592 | ); |
|
|
593 | |
|
|
594 | if (strstr (ns->version, "jcrossclient")) |
|
|
595 | /* let them, for now*/; |
576 | else |
596 | else |
577 | ns->send_packet ("addme_success"); |
597 | { |
|
|
598 | ns->flush (); |
|
|
599 | //ns->destroy (); |
|
|
600 | } |
|
|
601 | //ns->facecache = true; |
|
|
602 | } |
|
|
603 | |
|
|
604 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
578 | } |
605 | } |
579 | |
606 | |
580 | /** Reply to ExtendedInfos command */ |
607 | /** Reply to ExtendedInfos command */ |
581 | void |
608 | void |
582 | ToggleExtendedInfos (char *buf, int len, client * ns) |
609 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
692 | |
719 | |
693 | ns->send_packet (cmdback); |
720 | ns->send_packet (cmdback); |
694 | } |
721 | } |
695 | |
722 | |
696 | /** |
723 | /** |
697 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
724 | * client requested an image. send it rate-limited |
698 | * Basically, it makes no sense to wait for the client to request a |
725 | * before flushing. |
699 | * a piece of data from us that we know the client wants. So |
|
|
700 | * if we know the client wants it, might as well push it to the |
|
|
701 | * client. |
|
|
702 | */ |
|
|
703 | static void |
|
|
704 | SendSmooth (client *ns, uint16 face) |
|
|
705 | { |
|
|
706 | uint16 smoothface; |
|
|
707 | |
|
|
708 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
709 | * again. |
|
|
710 | */ |
726 | */ |
711 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
727 | void |
712 | { |
728 | AskFaceCmd (char *buf, int len, client *ns) |
713 | |
729 | { |
714 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
730 | ns->askface.push_back (atoi (buf)); |
715 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
716 | return; |
|
|
717 | } |
|
|
718 | |
|
|
719 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
720 | esrv_send_face (ns, smoothface, 0); |
|
|
721 | |
|
|
722 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
723 | |
|
|
724 | packet sl ("smooth"); |
|
|
725 | |
|
|
726 | sl << uint16 (face) |
|
|
727 | << uint16 (smoothface); |
|
|
728 | |
|
|
729 | ns->send_packet (sl); |
|
|
730 | } |
731 | } |
731 | |
732 | |
732 | /** |
733 | /** |
733 | * Tells client the picture it has to use |
734 | * Tells client the picture it has to use |
734 | * to smooth a picture number given as argument. |
735 | * to smooth a picture number given as argument. |
735 | */ |
736 | */ |
736 | void |
737 | void |
737 | AskSmooth (char *buf, int len, client *ns) |
738 | AskSmooth (char *buf, int len, client *ns) |
738 | { |
739 | { |
739 | SendSmooth (ns, atoi (buf)); |
740 | ns->send_face (atoi (buf)); |
740 | } |
741 | } |
741 | |
742 | |
742 | /** |
743 | /** |
743 | * This handles the general commands from the client (ie, north, fire, cast, |
744 | * This handles the general commands from the client (ie, north, fire, cast, |
744 | * etc.) |
745 | * etc.) |
… | |
… | |
803 | * commands. |
804 | * commands. |
804 | */ |
805 | */ |
805 | pl->count = 0; |
806 | pl->count = 0; |
806 | |
807 | |
807 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
808 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
808 | int time = FABS (pl->ob->speed) < 0.001 |
809 | int time = fabs (pl->ob->speed) < 0.001 |
809 | ? time = MAX_TIME * 100 |
810 | ? time = MAX_TIME * 100 |
810 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
811 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
811 | |
812 | |
812 | /* Send confirmation of command execution now */ |
813 | /* Send confirmation of command execution now */ |
813 | packet sl ("comc"); |
814 | packet sl ("comc"); |
814 | sl << uint16 (cmdid) << uint32 (time); |
815 | sl << uint16 (cmdid) << uint32 (time); |
815 | pl->socket->send_packet (sl); |
816 | pl->ns->send_packet (sl); |
816 | } |
817 | } |
817 | |
|
|
818 | |
818 | |
819 | /** This is a reply to a previous query. */ |
819 | /** This is a reply to a previous query. */ |
820 | void |
820 | void |
821 | ReplyCmd (char *buf, int len, player *pl) |
821 | ReplyCmd (char *buf, int len, client *ns) |
822 | { |
822 | { |
|
|
823 | if (ns->state == ST_CUSTOM) |
|
|
824 | { |
|
|
825 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
826 | return; |
|
|
827 | } |
|
|
828 | |
|
|
829 | if (!ns->pl) |
|
|
830 | return; //TODO: depends on the exact reply we are after |
|
|
831 | //TODO: but right now, we always have a ns->pl |
|
|
832 | |
|
|
833 | player *pl = ns->pl; |
|
|
834 | |
823 | /* This is to synthesize how the data would be stored if it |
835 | /* This is to synthesize how the data would be stored if it |
824 | * was normally entered. A bit of a hack, and should be cleaned up |
836 | * was normally entered. A bit of a hack, and should be cleaned up |
825 | * once all the X11 code is removed from the server. |
837 | * once all the X11 code is removed from the server. |
826 | * |
838 | * |
827 | * We pass 13 to many of the functions because this way they |
839 | * We pass 13 to many of the functions because this way they |
… | |
… | |
830 | */ |
842 | */ |
831 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
843 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
832 | |
844 | |
833 | /* this avoids any hacking here */ |
845 | /* this avoids any hacking here */ |
834 | |
846 | |
835 | switch (pl->state) |
847 | switch (ns->state) |
836 | { |
848 | { |
837 | case ST_PLAYING: |
849 | case ST_PLAYING: |
838 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
850 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
839 | break; |
851 | break; |
840 | |
852 | |
841 | case ST_PLAY_AGAIN: |
|
|
842 | /* We can check this for return value (2==quit). Maybe we |
|
|
843 | * should, and do something appropriate? |
|
|
844 | */ |
|
|
845 | receive_play_again (pl->ob, buf[0]); |
|
|
846 | break; |
|
|
847 | |
|
|
848 | case ST_ROLL_STAT: |
|
|
849 | key_roll_stat (pl->ob, buf[0]); |
|
|
850 | break; |
|
|
851 | |
|
|
852 | case ST_CHANGE_CLASS: |
853 | case ST_CHANGE_CLASS: |
853 | |
|
|
854 | key_change_class (pl->ob, buf[0]); |
854 | key_change_class (pl->ob, buf[0]); |
855 | break; |
|
|
856 | |
|
|
857 | case ST_CONFIRM_QUIT: |
|
|
858 | key_confirm_quit (pl->ob, buf[0]); |
|
|
859 | break; |
|
|
860 | |
|
|
861 | case ST_CONFIGURE: |
|
|
862 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
863 | pl->state = ST_PLAYING; |
|
|
864 | break; |
|
|
865 | |
|
|
866 | case ST_GET_NAME: |
|
|
867 | receive_player_name (pl->ob, 13); |
|
|
868 | break; |
|
|
869 | |
|
|
870 | case ST_GET_PASSWORD: |
|
|
871 | case ST_CONFIRM_PASSWORD: |
|
|
872 | receive_player_password (pl->ob, 13); |
|
|
873 | break; |
855 | break; |
874 | |
856 | |
875 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
857 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
876 | receive_party_password (pl->ob, 13); |
858 | receive_party_password (pl->ob, 13); |
877 | break; |
859 | break; |
878 | |
860 | |
879 | default: |
861 | default: |
880 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
862 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
881 | } |
863 | } |
882 | } |
864 | } |
883 | |
865 | |
884 | /** |
866 | /** |
885 | * Client tells its version. If there is a mismatch, we close the |
867 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
900 | ns->cs_version = atoi (buf); |
882 | ns->cs_version = atoi (buf); |
901 | ns->sc_version = ns->cs_version; |
883 | ns->sc_version = ns->cs_version; |
902 | |
884 | |
903 | LOG (llevDebug, "connection from client <%s>\n", buf); |
885 | LOG (llevDebug, "connection from client <%s>\n", buf); |
904 | |
886 | |
905 | |
|
|
906 | //TODO: should log here just for statistics |
887 | //TODO: should log here just for statistics |
907 | |
888 | |
908 | //if (VERSION_CS != ns->cs_version) |
889 | //if (VERSION_CS != ns->cs_version) |
909 | // unchecked; |
890 | // unchecked; |
910 | |
891 | |
… | |
… | |
935 | { |
916 | { |
936 | ns->sound = atoi (buf); |
917 | ns->sound = atoi (buf); |
937 | } |
918 | } |
938 | |
919 | |
939 | /** client wants the map resent */ |
920 | /** client wants the map resent */ |
940 | |
|
|
941 | void |
921 | void |
942 | MapRedrawCmd (char *buf, int len, player *pl) |
922 | MapRedrawCmd (char *buf, int len, player *pl) |
943 | { |
923 | { |
944 | /* This function is currently disabled; just clearing the map state results in |
924 | /* This function is currently disabled; just clearing the map state results in |
945 | * display errors. It should clear the cache and send a newmap command. |
925 | * display errors. It should clear the cache and send a newmap command. |
… | |
… | |
1032 | esrv_update_stats (player *pl) |
1012 | esrv_update_stats (player *pl) |
1033 | { |
1013 | { |
1034 | char buf[MAX_BUF]; |
1014 | char buf[MAX_BUF]; |
1035 | uint16 flags; |
1015 | uint16 flags; |
1036 | |
1016 | |
|
|
1017 | client *ns = pl->ns; |
|
|
1018 | if (!ns) |
|
|
1019 | return; |
|
|
1020 | |
|
|
1021 | object *ob = pl->ob; |
|
|
1022 | if (!ob) |
|
|
1023 | return; |
|
|
1024 | |
1037 | packet sl ("stats"); |
1025 | packet sl ("stats"); |
1038 | |
1026 | |
1039 | if (pl->ob) |
|
|
1040 | { |
|
|
1041 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1027 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1042 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1028 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1043 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1029 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1044 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1030 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1045 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1031 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1046 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1032 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1047 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1033 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1048 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1049 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1050 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1051 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1034 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1052 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1035 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
1036 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
1037 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
1038 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1053 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1039 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1054 | } |
|
|
1055 | |
1040 | |
1056 | if (pl->socket->exp64) |
|
|
1057 | for (int s = 0; s < NUM_SKILLS; s++) |
1041 | for (int s = 0; s < NUM_SKILLS; s++) |
1058 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1042 | if (object *skill = pl->last_skill_ob[s]) |
|
|
1043 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1059 | { |
1044 | { |
|
|
1045 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1046 | |
1060 | /* Always send along the level if exp changes. This is only |
1047 | /* Always send along the level if exp changes. This is only |
1061 | * 1 extra byte, but keeps processing simpler. |
1048 | * 1 extra byte, but keeps processing simpler. |
1062 | */ |
1049 | */ |
1063 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1050 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1064 | << uint8 (pl->last_skill_ob[s]->level) |
1051 | << uint8 (skill->level) |
1065 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1052 | << uint64 (skill->stats.exp); |
1066 | |
|
|
1067 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1068 | } |
1053 | } |
1069 | |
1054 | |
1070 | if (pl->socket->exp64) |
|
|
1071 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1055 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1072 | else |
|
|
1073 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1074 | |
|
|
1075 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1056 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1076 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1057 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1077 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1058 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1078 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1059 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1079 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1060 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1080 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1061 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1081 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1062 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1082 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1063 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1064 | |
1083 | flags = 0; |
1065 | flags = 0; |
1084 | |
1066 | |
1085 | if (pl->fire_on) |
1067 | if (pl->fire_on) |
1086 | flags |= SF_FIREON; |
1068 | flags |= SF_FIREON; |
1087 | |
1069 | |
1088 | if (pl->run_on) |
1070 | if (pl->run_on) |
1089 | flags |= SF_RUNON; |
1071 | flags |= SF_RUNON; |
1090 | |
1072 | |
1091 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1073 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1092 | |
1074 | |
1093 | if (pl->socket->sc_version < 1025) |
1075 | if (ns->sc_version < 1025) |
1094 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1076 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1095 | else |
1077 | else |
1096 | for (int i = 0; i < NROFATTACKS; i++) |
1078 | for (int i = 0; i < NROFATTACKS; i++) |
1097 | { |
1079 | { |
1098 | /* Skip ones we won't send */ |
1080 | /* Skip ones we won't send */ |
1099 | if (atnr_cs_stat[i] == -1) |
1081 | if (atnr_cs_stat[i] == -1) |
1100 | continue; |
1082 | continue; |
1101 | |
1083 | |
1102 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1084 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1103 | } |
1085 | } |
1104 | |
1086 | |
1105 | if (pl->socket->monitor_spells) |
1087 | if (pl->ns->monitor_spells) |
1106 | { |
1088 | { |
1107 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1089 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1108 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1090 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1109 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1091 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1110 | } |
1092 | } |
1111 | |
1093 | |
1112 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1094 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1113 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1095 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1114 | set_title (pl->ob, buf); |
1096 | set_title (ob, buf); |
1115 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1097 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1116 | |
1098 | |
1117 | /* Only send it away if we have some actual data */ |
1099 | /* Only send it away if we have some actual data */ |
1118 | if (sl.length () > 6) |
1100 | if (sl.length () > 6) |
1119 | pl->socket->send_packet (sl); |
1101 | ns->send_packet (sl); |
1120 | } |
1102 | } |
1121 | |
1103 | |
1122 | /** |
1104 | /** |
1123 | * Tells the client that here is a player it should start using. |
1105 | * Tells the client that here is a player it should start using. |
1124 | */ |
1106 | */ |
1125 | void |
1107 | void |
1126 | esrv_new_player (player *pl, uint32 weight) |
1108 | esrv_new_player (player *pl, uint32 weight) |
1127 | { |
1109 | { |
1128 | pl->last_weight = weight; |
|
|
1129 | |
|
|
1130 | packet sl ("player"); |
1110 | packet sl ("player"); |
1131 | |
1111 | |
1132 | sl << uint32 (pl->ob->count) |
1112 | sl << uint32 (pl->ob->count) |
1133 | << uint32 (weight) |
1113 | << uint32 (weight) |
1134 | << uint32 (pl->ob->face->number) |
1114 | << uint32 (pl->ob->face) |
1135 | << data8 (pl->ob->name); |
1115 | << data8 (pl->ob->name); |
1136 | |
1116 | |
|
|
1117 | pl->ns->last_weight = weight; |
1137 | pl->socket->send_packet (sl); |
1118 | pl->ns->send_packet (sl); |
1138 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1119 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1139 | } |
1120 | } |
1140 | |
|
|
1141 | /** |
|
|
1142 | * Need to send an animation sequence to the client. |
|
|
1143 | * We will send appropriate face commands to the client if we haven't |
|
|
1144 | * sent them the face yet (this can become quite costly in terms of |
|
|
1145 | * how much we are sending - on the other hand, this should only happen |
|
|
1146 | * when the player logs in and picks stuff up. |
|
|
1147 | */ |
|
|
1148 | void |
|
|
1149 | esrv_send_animation (client * ns, short anim_num) |
|
|
1150 | { |
|
|
1151 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1152 | * are added in contigous order, so if the number is in the valid |
|
|
1153 | * range, it must be a valid animation. |
|
|
1154 | */ |
|
|
1155 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1156 | { |
|
|
1157 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1158 | return; |
|
|
1159 | } |
|
|
1160 | |
|
|
1161 | packet sl ("anim"); |
|
|
1162 | |
|
|
1163 | sl << uint16 (anim_num) |
|
|
1164 | << uint16 (0); /* flags - not used right now */ |
|
|
1165 | |
|
|
1166 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1167 | * the face itself) down to the client. |
|
|
1168 | */ |
|
|
1169 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1170 | { |
|
|
1171 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1172 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1173 | |
|
|
1174 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1175 | } |
|
|
1176 | |
|
|
1177 | ns->send_packet (sl); |
|
|
1178 | |
|
|
1179 | ns->anims_sent[anim_num] = 1; |
|
|
1180 | } |
|
|
1181 | |
|
|
1182 | |
1121 | |
1183 | /****************************************************************************** |
1122 | /****************************************************************************** |
1184 | * |
1123 | * |
1185 | * Start of map related commands. |
1124 | * Start of map related commands. |
1186 | * |
1125 | * |
1187 | ******************************************************************************/ |
1126 | ******************************************************************************/ |
1188 | |
1127 | |
1189 | /** |
|
|
1190 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1191 | * the face yet, we will also send it. |
|
|
1192 | */ |
|
|
1193 | static void |
|
|
1194 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1195 | { |
|
|
1196 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1197 | { |
|
|
1198 | //TODO: one or the other, can't both have abort and return, verify and act |
|
|
1199 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1200 | return; |
|
|
1201 | abort (); |
|
|
1202 | } |
|
|
1203 | |
|
|
1204 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1205 | newmap->cells[x][y].count++; |
|
|
1206 | |
|
|
1207 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1208 | esrv_send_face (ns, face_num, 0); |
|
|
1209 | } |
|
|
1210 | |
|
|
1211 | /** Clears a map cell */ |
1128 | /** Clears a map cell */ |
1212 | static void |
1129 | static void |
1213 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1130 | map_clearcell (struct MapCell *cell, int count) |
1214 | { |
1131 | { |
1215 | cell->faces[0] = face0; |
1132 | cell->faces[0] = 0; |
1216 | cell->faces[1] = face1; |
1133 | cell->faces[1] = 0; |
1217 | cell->faces[2] = face2; |
1134 | cell->faces[2] = 0; |
|
|
1135 | cell->smooth[0] = 0; |
|
|
1136 | cell->smooth[1] = 0; |
|
|
1137 | cell->smooth[2] = 0; |
1218 | cell->count = count; |
1138 | cell->count = count; |
1219 | cell->stat_hp = 0; |
1139 | cell->stat_hp = 0; |
1220 | cell->flags = 0; |
1140 | cell->flags = 0; |
1221 | cell->player = 0; |
1141 | cell->player = 0; |
1222 | } |
1142 | } |
1223 | |
1143 | |
1224 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1225 | #define MAX_LAYERS 3 |
1144 | #define MAX_LAYERS 3 |
1226 | |
|
|
1227 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1228 | * allocating and deallocating such a block of data each time run through, |
|
|
1229 | * and saves the space of allocating this in the socket object when we only |
|
|
1230 | * need it for this cycle. If the server is ever threaded, this needs to be |
|
|
1231 | * re-examined. |
|
|
1232 | */ |
|
|
1233 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1234 | |
|
|
1235 | /** |
|
|
1236 | * Returns true if any of the heads for this |
|
|
1237 | * space is set. Returns false if all are blank - this is used |
|
|
1238 | * for empty space checking. |
|
|
1239 | */ |
|
|
1240 | static inline int |
|
|
1241 | have_head (int ax, int ay) |
|
|
1242 | { |
|
|
1243 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1244 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1245 | return 1; |
|
|
1246 | |
|
|
1247 | return 0; |
|
|
1248 | } |
|
|
1249 | |
|
|
1250 | /** |
|
|
1251 | * check_head is a bit simplistic version of update_space below. |
|
|
1252 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1253 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1254 | * if needed, and returning 1. If this no data needs to get |
|
|
1255 | * sent, it returns zero. |
|
|
1256 | */ |
|
|
1257 | static int |
|
|
1258 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
|
|
1259 | { |
|
|
1260 | short face_num; |
|
|
1261 | |
|
|
1262 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1263 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1264 | else |
|
|
1265 | face_num = 0; |
|
|
1266 | |
|
|
1267 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1268 | { |
|
|
1269 | sl << uint16 (face_num); |
|
|
1270 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1271 | esrv_send_face (&ns, face_num, 0); |
|
|
1272 | |
|
|
1273 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1274 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1275 | return 1; |
|
|
1276 | } |
|
|
1277 | |
|
|
1278 | return 0; /* No change */ |
|
|
1279 | } |
|
|
1280 | |
1145 | |
1281 | /** |
1146 | /** |
1282 | * Removes the need to replicate the same code for each layer. |
1147 | * Removes the need to replicate the same code for each layer. |
1283 | * this returns true if this space is now in fact different than |
1148 | * this returns true if this space is now in fact different than |
1284 | * it was. |
1149 | * it was. |
1285 | * sl is the socklist this data is going into. |
1150 | * sl is the socklist this data is going into. |
1286 | * ns is the socket we are working on - all the info we care |
1151 | * ns is the socket we are working on - all the info we care |
1287 | * about is in this socket structure, so now need not pass the |
1152 | * about is in this socket structure, so now need not pass the |
1288 | * entire player object. |
1153 | * entire player object. |
1289 | * mx and my are map coordinate offsets for map mp |
|
|
1290 | * sx and sy are the offsets into the socket structure that |
|
|
1291 | * holds the old values. |
|
|
1292 | * layer is the layer to update, with 2 being the floor and 0 the |
1154 | * layer is the layer to update, with 2 being the floor and 0 the |
1293 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1155 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1294 | * take. Interesting to note that before this function, the map1 function |
1156 | * take. Interesting to note that before this function, the map1 function |
1295 | * numbers the spaces differently - I think this was a leftover from |
1157 | * numbers the spaces differently - I think this was a leftover from |
1296 | * the map command, where the faces stack up. Sinces that is no longer |
1158 | * the map command, where the faces stack up. Sinces that is no longer |
1297 | * the case, it seems to make more sense to have these layer values |
1159 | * the case, it seems to make more sense to have these layer values |
1298 | * actually match. |
1160 | * actually match. |
1299 | */ |
1161 | */ |
1300 | static int |
1162 | static int |
1301 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1163 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1302 | { |
1164 | { |
1303 | object *ob, *head; |
1165 | object *ob = ms.faces_obj [layer]; |
1304 | uint16 face_num; |
|
|
1305 | int bx, by, i; |
|
|
1306 | |
|
|
1307 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1308 | * If not, then do the normal processing. |
|
|
1309 | */ |
|
|
1310 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1311 | |
|
|
1312 | /* Check to see if this head is part of the set of objects |
|
|
1313 | * we would normally send for this space. If so, then |
|
|
1314 | * don't use the head value. We need to do the check |
|
|
1315 | * here and not when setting up the heads[] value for two reasons - |
|
|
1316 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1317 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1318 | * rather not need to do the map translation overhead. |
|
|
1319 | * 3) We need to do some extra checking to make sure that we will |
|
|
1320 | * otherwise send the image as this layer, eg, either it matches |
|
|
1321 | * the head value, or is not multipart. |
|
|
1322 | */ |
|
|
1323 | if (head && !head->more) |
|
|
1324 | { |
|
|
1325 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1326 | { |
|
|
1327 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1328 | if (!ob) |
|
|
1329 | continue; |
|
|
1330 | |
|
|
1331 | if (ob->head) |
|
|
1332 | ob = ob->head; |
|
|
1333 | |
|
|
1334 | if (ob == head) |
|
|
1335 | { |
|
|
1336 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1337 | head = NULL; |
|
|
1338 | break; |
|
|
1339 | } |
|
|
1340 | } |
|
|
1341 | } |
|
|
1342 | |
|
|
1343 | ob = head; |
|
|
1344 | if (!ob) |
|
|
1345 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1346 | |
1166 | |
1347 | /* If there is no object for this space, or if the face for the object |
1167 | /* If there is no object for this space, or if the face for the object |
1348 | * is the blank face, set the face number to zero. |
1168 | * is the blank face, set the face number to zero. |
1349 | * else if we have the stored head object for this space, that takes |
1169 | * else if we have the stored head object for this space, that takes |
1350 | * precedence over the other object for this space. |
1170 | * precedence over the other object for this space. |
1351 | * otherwise, we do special head processing |
1171 | * otherwise, we do special head processing |
1352 | */ |
1172 | */ |
1353 | if (!ob || ob->face == blank_face) |
1173 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1354 | face_num = 0; |
|
|
1355 | else if (head) |
|
|
1356 | { |
|
|
1357 | /* if this is a head that had previously been stored */ |
|
|
1358 | face_num = ob->face->number; |
|
|
1359 | } |
|
|
1360 | else |
|
|
1361 | { |
|
|
1362 | /* if the faces for the different parts of a multipart object |
|
|
1363 | * are the same, we only want to send the bottom right most |
|
|
1364 | * portion of the object. That info is in the tail_.. values |
|
|
1365 | * of the head. Note that for the head itself, ob->head will |
|
|
1366 | * be null, so we only do this block if we are working on |
|
|
1367 | * a tail piece. |
|
|
1368 | */ |
|
|
1369 | |
|
|
1370 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1371 | * this is the head object and these are set, we proceed |
|
|
1372 | * with logic to only send bottom right. Similarly, if |
|
|
1373 | * this is one of the more parts but the head has those values |
|
|
1374 | * set, we want to do the processing. There can be cases where |
|
|
1375 | * the head is not visible but one of its parts is, so we just |
|
|
1376 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1377 | * object we may want to display. |
|
|
1378 | */ |
|
|
1379 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1380 | { |
|
|
1381 | |
|
|
1382 | if (ob->head) |
|
|
1383 | head = ob->head; |
|
|
1384 | else |
|
|
1385 | head = ob; |
|
|
1386 | |
|
|
1387 | /* Basically figure out where the offset is from where we are right |
|
|
1388 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1389 | * piece is from the head, and the tail is where the tail is from the |
|
|
1390 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1391 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1392 | * will be zero, so the right thing will still happen. |
|
|
1393 | */ |
|
|
1394 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1395 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1396 | |
|
|
1397 | /* I don't think this can ever happen, but better to check for it just |
|
|
1398 | * in case. |
|
|
1399 | */ |
|
|
1400 | if (bx < sx || by < sy) |
|
|
1401 | { |
|
|
1402 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1403 | face_num = 0; |
|
|
1404 | } |
|
|
1405 | /* single part object, multipart object with non merged faces, |
|
|
1406 | * of multipart object already at lower right. |
|
|
1407 | */ |
|
|
1408 | else if (bx == sx && by == sy) |
|
|
1409 | { |
|
|
1410 | face_num = ob->face->number; |
|
|
1411 | |
|
|
1412 | /* if this face matches one stored away, clear that one away. |
|
|
1413 | * this code relies on the fact that the map1 commands |
|
|
1414 | * goes from 2 down to 0. |
|
|
1415 | */ |
|
|
1416 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1417 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1418 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1419 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1420 | } |
|
|
1421 | else |
|
|
1422 | { |
|
|
1423 | /* If this head is stored away, clear it - otherwise, |
|
|
1424 | * there can be cases where a object is on multiple layers - |
|
|
1425 | * we only want to send it once. |
|
|
1426 | */ |
|
|
1427 | face_num = head->face->number; |
|
|
1428 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1429 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1430 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1431 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1432 | |
|
|
1433 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1434 | * then find another layer. |
|
|
1435 | */ |
|
|
1436 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1437 | { |
|
|
1438 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1439 | } |
|
|
1440 | else |
|
|
1441 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1442 | { |
|
|
1443 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1444 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1445 | { |
|
|
1446 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1447 | } |
|
|
1448 | } |
|
|
1449 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1450 | } |
|
|
1451 | } |
|
|
1452 | else |
|
|
1453 | { |
|
|
1454 | /* In this case, we are already at the lower right or single part object, |
|
|
1455 | * so nothing special |
|
|
1456 | */ |
|
|
1457 | face_num = ob->face->number; |
|
|
1458 | |
|
|
1459 | /* clear out any head entries that have the same face as this one */ |
|
|
1460 | for (bx = 0; bx < layer; bx++) |
|
|
1461 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1462 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1463 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1464 | } |
|
|
1465 | } /* else not already head object or blank face */ |
|
|
1466 | |
|
|
1467 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1468 | * but there is a head on the next layer, send that instead. |
|
|
1469 | * Without this, what happens is you can get the case where the player stands |
|
|
1470 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1471 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1472 | * This tends to make stacking also work/look better. |
|
|
1473 | */ |
|
|
1474 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1475 | { |
|
|
1476 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1477 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1478 | } |
|
|
1479 | |
|
|
1480 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1481 | * we already sent for a lower layer. In that case, don't send |
|
|
1482 | * this one. |
|
|
1483 | */ |
|
|
1484 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1485 | face_num = 0; |
|
|
1486 | |
1174 | |
1487 | /* We've gotten what face we want to use for the object. Now see if |
1175 | /* We've gotten what face we want to use for the object. Now see if |
1488 | * if it has changed since we last sent it to the client. |
1176 | * if it has changed since we last sent it to the client. |
1489 | */ |
1177 | */ |
1490 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1178 | if (lastcell.faces[layer] != face_num) |
1491 | { |
1179 | { |
1492 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1180 | lastcell.faces[layer] = face_num; |
|
|
1181 | |
1493 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1182 | if (!ns.faces_sent[face_num]) |
|
|
1183 | if (ob) |
|
|
1184 | ns.send_faces (ob); |
|
|
1185 | else |
1494 | esrv_send_face (&ns, face_num, 0); |
1186 | ns.send_face (face_num); |
1495 | |
1187 | |
1496 | sl << uint16 (face_num); |
1188 | sl << uint16 (face_num); |
1497 | return 1; |
|
|
1498 | } |
|
|
1499 | |
|
|
1500 | /* Nothing changed */ |
|
|
1501 | return 0; |
|
|
1502 | } |
|
|
1503 | |
|
|
1504 | /** |
|
|
1505 | * This function is mainly a copy of update_space, |
|
|
1506 | * except it handles update of the smoothing updates, |
|
|
1507 | * not the face updates. |
|
|
1508 | * Removes the need to replicate the same code for each layer. |
|
|
1509 | * this returns true if this smooth is now in fact different |
|
|
1510 | * than it was. |
|
|
1511 | * sl is the socklist this data is going into. |
|
|
1512 | * ns is the socket we are working on - all the info we care |
|
|
1513 | * about is in this socket structure, so know need to pass the |
|
|
1514 | * entire player object. |
|
|
1515 | * mx and my are map coordinate offsets for map mp |
|
|
1516 | * sx and sy are the offsets into the socket structure that |
|
|
1517 | * holds the old values. |
|
|
1518 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1519 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1520 | * take. |
|
|
1521 | */ |
|
|
1522 | |
|
|
1523 | static inline int |
|
|
1524 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1525 | { |
|
|
1526 | object *ob; |
|
|
1527 | int smoothlevel; /* old face_num; */ |
|
|
1528 | |
|
|
1529 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1530 | |
|
|
1531 | /* If there is no object for this space, or if the face for the object |
|
|
1532 | * is the blank face, set the smoothlevel to zero. |
|
|
1533 | */ |
|
|
1534 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
|
|
1535 | smoothlevel = 0; |
|
|
1536 | else |
|
|
1537 | { |
|
|
1538 | smoothlevel = ob->smoothlevel; |
|
|
1539 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1540 | SendSmooth (&ns, ob->face->number); |
|
|
1541 | } /* else not already head object or blank face */ |
|
|
1542 | |
|
|
1543 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1544 | * if it has changed since we last sent it to the client. |
|
|
1545 | */ |
|
|
1546 | if (smoothlevel > 255) |
|
|
1547 | smoothlevel = 255; |
|
|
1548 | else if (smoothlevel < 0) |
|
|
1549 | smoothlevel = 0; |
|
|
1550 | |
|
|
1551 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1552 | { |
|
|
1553 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1554 | sl << uint8 (smoothlevel); |
|
|
1555 | return 1; |
1189 | return 1; |
1556 | } |
1190 | } |
1557 | |
1191 | |
1558 | /* Nothing changed */ |
1192 | /* Nothing changed */ |
1559 | return 0; |
1193 | return 0; |
… | |
… | |
1574 | if (ns->EMI_smooth) |
1208 | if (ns->EMI_smooth) |
1575 | result += 1; /*One byte for smoothlevel */ |
1209 | result += 1; /*One byte for smoothlevel */ |
1576 | } |
1210 | } |
1577 | |
1211 | |
1578 | return result; |
1212 | return result; |
|
|
1213 | } |
|
|
1214 | |
|
|
1215 | // prefetch (and touch) all maps within a specific distancd |
|
|
1216 | static void |
|
|
1217 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1218 | { |
|
|
1219 | map->last_access = runtime; |
|
|
1220 | |
|
|
1221 | if (--distance) |
|
|
1222 | for (int dir = 4; --dir; ) |
|
|
1223 | if (const shstr &path = map->tile_path [dir]) |
|
|
1224 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1225 | prefetch_surrounding_maps (neigh, distance); |
|
|
1226 | else |
|
|
1227 | neigh = maptile::find_async (path, map); |
|
|
1228 | } |
|
|
1229 | |
|
|
1230 | // prefetch a generous area around the player |
|
|
1231 | static void |
|
|
1232 | prefetch_surrounding_maps (object *op) |
|
|
1233 | { |
|
|
1234 | prefetch_surrounding_maps (op->map, 3); |
1579 | } |
1235 | } |
1580 | |
1236 | |
1581 | /** |
1237 | /** |
1582 | * This function uses the new map1 protocol command to send the map |
1238 | * This function uses the new map1 protocol command to send the map |
1583 | * to the client. It is necessary because the old map command supports |
1239 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1589 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1245 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1590 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1246 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1591 | * and use the other 4 bits for other informatiion. For full documentation |
1247 | * and use the other 4 bits for other informatiion. For full documentation |
1592 | * of what we send, see the doc/Protocol file. |
1248 | * of what we send, see the doc/Protocol file. |
1593 | * I will describe internally what we do: |
1249 | * I will describe internally what we do: |
1594 | * the socket->lastmap shows how the map last looked when sent to the client. |
1250 | * the ns->lastmap shows how the map last looked when sent to the client. |
1595 | * in the lastmap structure, there is a cells array, which is set to the |
1251 | * in the lastmap structure, there is a cells array, which is set to the |
1596 | * maximum viewable size (As set in config.h). |
1252 | * maximum viewable size (As set in config.h). |
1597 | * in the cells, there are faces and a count value. |
1253 | * in the cells, there are faces and a count value. |
1598 | * we use the count value to hold the darkness value. If -1, then this space |
1254 | * we use the count value to hold the darkness value. If -1, then this space |
1599 | * is not viewable. |
1255 | * is not viewable. |
… | |
… | |
1601 | * look like. |
1257 | * look like. |
1602 | */ |
1258 | */ |
1603 | void |
1259 | void |
1604 | draw_client_map1 (object *pl) |
1260 | draw_client_map1 (object *pl) |
1605 | { |
1261 | { |
1606 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1262 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1607 | sint16 nx, ny; |
1263 | sint16 nx, ny; |
1608 | int estartlen, eoldlen; |
1264 | int estartlen, eoldlen; |
1609 | uint16 mask, emask; |
|
|
1610 | uint8 eentrysize; |
1265 | uint8 eentrysize; |
1611 | uint16 ewhatstart, ewhatflag; |
1266 | uint16 ewhatstart, ewhatflag; |
1612 | uint8 extendedinfos; |
1267 | uint8 extendedinfos; |
1613 | maptile *m; |
1268 | maptile *m; |
1614 | |
1269 | |
1615 | client &socket = *pl->contr->socket; |
1270 | client &socket = *pl->contr->ns; |
|
|
1271 | |
|
|
1272 | if (!pl->active) |
|
|
1273 | return; |
1616 | |
1274 | |
1617 | check_map_change (pl->contr); |
1275 | check_map_change (pl->contr); |
|
|
1276 | prefetch_surrounding_maps (pl); |
1618 | |
1277 | |
1619 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1278 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1620 | packet esl; |
1279 | packet esl; |
1621 | |
1280 | |
1622 | startlen = sl.length (); |
1281 | startlen = sl.length (); |
… | |
… | |
1637 | << uint8 (extendedinfos) |
1296 | << uint8 (extendedinfos) |
1638 | << uint8 (eentrysize); |
1297 | << uint8 (eentrysize); |
1639 | |
1298 | |
1640 | estartlen = esl.length (); |
1299 | estartlen = esl.length (); |
1641 | } |
1300 | } |
1642 | else |
|
|
1643 | { |
|
|
1644 | /* suppress compiler warnings */ |
|
|
1645 | ewhatstart = 0; |
|
|
1646 | ewhatflag = 0; |
|
|
1647 | estartlen = 0; |
|
|
1648 | } |
|
|
1649 | |
|
|
1650 | /* Init data to zero */ |
|
|
1651 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1652 | |
1301 | |
1653 | /* x,y are the real map locations. ax, ay are viewport relative |
1302 | /* x,y are the real map locations. ax, ay are viewport relative |
1654 | * locations. |
1303 | * locations. |
1655 | */ |
1304 | */ |
1656 | ay = 0; |
1305 | ay = 0; |
… | |
… | |
1659 | * but that started to get a bit messy to look at. |
1308 | * but that started to get a bit messy to look at. |
1660 | */ |
1309 | */ |
1661 | max_x = pl->x + (socket.mapx + 1) / 2; |
1310 | max_x = pl->x + (socket.mapx + 1) / 2; |
1662 | max_y = pl->y + (socket.mapy + 1) / 2; |
1311 | max_y = pl->y + (socket.mapy + 1) / 2; |
1663 | |
1312 | |
1664 | if (socket.mapmode == Map1aCmd) |
1313 | maptile *plmap = pl->map; |
1665 | { |
|
|
1666 | max_x += MAX_HEAD_OFFSET; |
|
|
1667 | max_y += MAX_HEAD_OFFSET; |
|
|
1668 | } |
|
|
1669 | |
1314 | |
1670 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1315 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1671 | { |
1316 | { |
1672 | ax = 0; |
1317 | ax = 0; |
1673 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1318 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1674 | { |
1319 | { |
|
|
1320 | int emask, mask; |
1675 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1321 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1676 | |
1322 | |
1677 | /* If this space is out of the normal viewable area, we only check |
|
|
1678 | * the heads value ax or ay will only be greater than what |
|
|
1679 | * the client wants if using the map1a command - this is because |
|
|
1680 | * if the map1a command is not used, max_x and max_y will be |
|
|
1681 | * set to lower values. |
|
|
1682 | */ |
|
|
1683 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1684 | { |
|
|
1685 | int i, got_one; |
|
|
1686 | |
|
|
1687 | oldlen = sl.length (); |
|
|
1688 | |
|
|
1689 | sl << uint16 (mask); |
|
|
1690 | |
|
|
1691 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1692 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1693 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1694 | |
|
|
1695 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1696 | * actually need to send that - just the coordinates |
|
|
1697 | * with no faces tells the client to blank out the |
|
|
1698 | * space. |
|
|
1699 | */ |
|
|
1700 | got_one = 0; |
|
|
1701 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1702 | if (sl[i]) |
|
|
1703 | got_one = 1; |
|
|
1704 | |
|
|
1705 | if (got_one && (mask & 0xf)) |
|
|
1706 | sl[oldlen + 1] = mask & 0xff; |
|
|
1707 | else |
|
|
1708 | { /*either all faces blank, either no face at all */ |
|
|
1709 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1710 | sl.reset (oldlen + 2); |
|
|
1711 | else |
|
|
1712 | sl.reset (oldlen); |
|
|
1713 | } |
|
|
1714 | |
|
|
1715 | /*What concerns extendinfos, nothing to be done for now |
|
|
1716 | * (perhaps effects layer later) |
|
|
1717 | */ |
|
|
1718 | continue; /* don't do processing below */ |
|
|
1719 | } |
|
|
1720 | |
|
|
1721 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1323 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1722 | |
|
|
1723 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1724 | |
1324 | |
1725 | /* If the coordinates are not valid, or it is too dark to see, |
1325 | /* If the coordinates are not valid, or it is too dark to see, |
1726 | * we tell the client as such |
1326 | * we tell the client as such |
1727 | */ |
1327 | */ |
1728 | nx = x; |
1328 | nx = x; |
1729 | ny = y; |
1329 | ny = y; |
1730 | m = get_map_from_coord (pl->map, &nx, &ny); |
1330 | m = get_map_from_coord (plmap, &nx, &ny); |
1731 | |
1331 | |
1732 | if (!m) |
1332 | if (!m) |
1733 | { |
1333 | { |
1734 | /* space is out of map. Update space and clear values |
1334 | /* space is out of map. Update space and clear values |
1735 | * if this hasn't already been done. If the space is out |
1335 | * if this hasn't already been done. If the space is out |
1736 | * of the map, it shouldn't have a head |
1336 | * of the map, it shouldn't have a head |
1737 | */ |
1337 | */ |
1738 | if (lastcell.count != -1) |
1338 | if (lastcell.count != -1) |
1739 | { |
1339 | { |
1740 | sl << uint16 (mask); |
1340 | sl << uint16 (mask); |
1741 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1341 | map_clearcell (&lastcell, -1); |
1742 | } |
1342 | } |
|
|
1343 | |
|
|
1344 | continue; |
1743 | } |
1345 | } |
|
|
1346 | |
|
|
1347 | m->touch (); |
|
|
1348 | |
|
|
1349 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1350 | |
1744 | else if (d > 3) |
1351 | if (d > 3) |
1745 | { |
1352 | { |
|
|
1353 | |
1746 | int need_send = 0, count; |
1354 | int need_send = 0, count; |
1747 | |
1355 | |
1748 | /* This block deals with spaces that are not visible for whatever |
1356 | /* This block deals with spaces that are not visible for whatever |
1749 | * reason. Still may need to send the head for this space. |
1357 | * reason. Still may need to send the head for this space. |
1750 | */ |
1358 | */ |
1751 | |
1359 | |
1752 | oldlen = sl.length (); |
1360 | oldlen = sl.length (); |
1753 | |
1361 | |
1754 | sl << uint16 (mask); |
1362 | sl << uint16 (mask); |
… | |
… | |
1756 | if (lastcell.count != -1) |
1364 | if (lastcell.count != -1) |
1757 | need_send = 1; |
1365 | need_send = 1; |
1758 | |
1366 | |
1759 | count = -1; |
1367 | count = -1; |
1760 | |
1368 | |
1761 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1762 | { |
|
|
1763 | /* Now check to see if any heads need to be sent */ |
|
|
1764 | |
|
|
1765 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1766 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1767 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1768 | |
|
|
1769 | lastcell.count = count; |
|
|
1770 | } |
|
|
1771 | else |
|
|
1772 | { |
|
|
1773 | /* properly clear a previously sent big face */ |
1369 | /* properly clear a previously sent big face */ |
1774 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1370 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1775 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1371 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1776 | need_send = 1; |
1372 | need_send = 1; |
1777 | |
1373 | |
1778 | map_clearcell (&lastcell, 0, 0, 0, count); |
1374 | map_clearcell (&lastcell, count); |
1779 | } |
|
|
1780 | |
1375 | |
1781 | if ((mask & 0xf) || need_send) |
1376 | if ((mask & 0xf) || need_send) |
1782 | sl[oldlen + 1] = mask & 0xff; |
1377 | sl[oldlen + 1] = mask & 0xff; |
1783 | else |
1378 | else |
1784 | sl.reset (oldlen); |
1379 | sl.reset (oldlen); |
1785 | } |
1380 | } |
1786 | else |
1381 | else |
1787 | { |
1382 | { |
1788 | /* In this block, the space is visible or there are head objects |
1383 | /* In this block, the space is visible. |
1789 | * we need to send. |
|
|
1790 | */ |
1384 | */ |
1791 | |
1385 | |
1792 | /* Rather than try to figure out what everything that we might |
1386 | /* Rather than try to figure out what everything that we might |
1793 | * need to send is, then form the packet after that, |
1387 | * need to send is, then form the packet after that, |
1794 | * we presume that we will in fact form a packet, and update |
1388 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1797 | * is done. |
1391 | * is done. |
1798 | * I think this is simpler than doing a bunch of checks to see |
1392 | * I think this is simpler than doing a bunch of checks to see |
1799 | * what if anything we need to send, setting the bits, then |
1393 | * what if anything we need to send, setting the bits, then |
1800 | * doing those checks again to add the real data. |
1394 | * doing those checks again to add the real data. |
1801 | */ |
1395 | */ |
1802 | oldlen = sl.length (); |
1396 | oldlen = sl.length (); |
1803 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1804 | eoldlen = esl.length (); |
1397 | eoldlen = esl.length (); |
1805 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1398 | |
1806 | sl << uint16 (mask); |
1399 | sl << uint16 (mask); |
1807 | |
|
|
1808 | if (socket.ext_mapinfos) |
|
|
1809 | esl << uint16 (emask); |
|
|
1810 | |
1400 | |
1811 | unsigned char dummy; |
1401 | unsigned char dummy; |
1812 | unsigned char *last_ext = &dummy; |
1402 | unsigned char *last_ext = &dummy; |
1813 | |
1403 | |
1814 | /* Darkness changed */ |
1404 | /* Darkness changed */ |
… | |
… | |
1826 | sl << uint8 (255 - 64 * d); |
1416 | sl << uint8 (255 - 64 * d); |
1827 | } |
1417 | } |
1828 | |
1418 | |
1829 | lastcell.count = d; |
1419 | lastcell.count = d; |
1830 | |
1420 | |
|
|
1421 | mapspace &ms = m->at (nx, ny); |
|
|
1422 | |
1831 | if (socket.extmap) |
1423 | if (socket.extmap) |
1832 | { |
1424 | { |
1833 | uint8 stat_hp = 0; |
1425 | uint8 stat_hp = 0; |
1834 | uint8 stat_width = 0; |
1426 | uint8 stat_width = 0; |
1835 | uint8 flags = 0; |
1427 | uint8 flags = 0; |
1836 | UUID player = 0; |
1428 | UUID player = 0; |
1837 | |
1429 | |
1838 | // send hp information, if applicable |
1430 | // send hp information, if applicable |
1839 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1431 | if (object *op = ms.faces_obj [0]) |
1840 | { |
1432 | { |
1841 | if (op->head || op->invisible) |
1433 | if (op->head || op->invisible) |
1842 | ; // do not show |
1434 | ; // do not show |
1843 | else if (op->type == PLAYER |
1435 | else if (op->type == PLAYER |
1844 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1436 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
… | |
… | |
1898 | sl << uint8 (8) << uint8 (flags); |
1490 | sl << uint8 (8) << uint8 (flags); |
1899 | } |
1491 | } |
1900 | } |
1492 | } |
1901 | |
1493 | |
1902 | /* Floor face */ |
1494 | /* Floor face */ |
1903 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1495 | if (update_space (sl, socket, ms, lastcell, 2)) |
1904 | mask |= 0x4; |
1496 | mask |= 0x4; |
1905 | |
1497 | |
1906 | if (socket.EMI_smooth) |
|
|
1907 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
1908 | emask |= 0x4; |
|
|
1909 | |
|
|
1910 | /* Middle face */ |
1498 | /* Middle face */ |
1911 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1499 | if (update_space (sl, socket, ms, lastcell, 1)) |
1912 | mask |= 0x2; |
1500 | mask |= 0x2; |
1913 | |
1501 | |
1914 | if (socket.EMI_smooth) |
1502 | if (ms.player () == pl |
1915 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1503 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
1916 | emask |= 0x2; |
|
|
1917 | |
|
|
1918 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
1919 | { |
1504 | { |
|
|
1505 | // force player to be visible to himself if invisible |
1920 | if (lastcell.faces[0] != pl->face->number) |
1506 | if (lastcell.faces[0] != pl->face) |
1921 | { |
1507 | { |
1922 | lastcell.faces[0] = pl->face->number; |
1508 | lastcell.faces[0] = pl->face; |
|
|
1509 | |
1923 | mask |= 0x1; |
1510 | mask |= 0x1; |
1924 | |
|
|
1925 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
|
|
1926 | esrv_send_face (&socket, pl->face->number, 0); |
|
|
1927 | |
|
|
1928 | sl << uint16 (pl->face->number); |
1511 | sl << uint16 (pl->face); |
|
|
1512 | |
|
|
1513 | socket.send_faces (pl); |
1929 | } |
1514 | } |
1930 | } |
1515 | } |
1931 | else |
|
|
1932 | { |
|
|
1933 | /* Top face */ |
1516 | /* Top face */ |
1934 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1517 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1935 | mask |= 0x1; |
1518 | mask |= 0x1; |
1936 | |
|
|
1937 | if (socket.EMI_smooth) |
|
|
1938 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
1939 | emask |= 0x1; |
|
|
1940 | } |
1519 | |
1941 | |
1520 | |
1942 | /* Check to see if we are in fact sending anything for this |
1521 | /* Check to see if we are in fact sending anything for this |
1943 | * space by checking the mask. If so, update the mask. |
1522 | * space by checking the mask. If so, update the mask. |
1944 | * if not, reset the len to that from before adding the mask |
1523 | * if not, reset the len to that from before adding the mask |
1945 | * value, so we don't send those bits. |
1524 | * value, so we don't send those bits. |
… | |
… | |
1947 | if (mask & 0xf) |
1526 | if (mask & 0xf) |
1948 | sl[oldlen + 1] = mask & 0xff; |
1527 | sl[oldlen + 1] = mask & 0xff; |
1949 | else |
1528 | else |
1950 | sl.reset (oldlen); |
1529 | sl.reset (oldlen); |
1951 | |
1530 | |
|
|
1531 | if (socket.ext_mapinfos) |
|
|
1532 | esl << uint16 (emask); |
|
|
1533 | |
|
|
1534 | if (socket.EMI_smooth) |
|
|
1535 | { |
|
|
1536 | for (int layer = 2+1; layer--; ) |
|
|
1537 | { |
|
|
1538 | object *ob = ms.faces_obj [layer]; |
|
|
1539 | |
|
|
1540 | // If there is no object for this space, or if the face for the object |
|
|
1541 | // is the blank face, set the smoothlevel to zero. |
|
|
1542 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1543 | |
|
|
1544 | // We've gotten what face we want to use for the object. Now see if |
|
|
1545 | // if it has changed since we last sent it to the client. |
|
|
1546 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1547 | { |
|
|
1548 | lastcell.smooth[layer] = smoothlevel; |
|
|
1549 | esl << uint8 (smoothlevel); |
|
|
1550 | emask |= 1 << layer; |
|
|
1551 | } |
|
|
1552 | } |
|
|
1553 | |
1952 | if (emask & 0xf) |
1554 | if (emask & 0xf) |
1953 | esl[eoldlen + 1] = emask & 0xff; |
1555 | esl[eoldlen + 1] = emask & 0xff; |
1954 | else |
1556 | else |
1955 | esl.reset (eoldlen); |
1557 | esl.reset (eoldlen); |
|
|
1558 | } |
1956 | } /* else this is a viewable space */ |
1559 | } /* else this is a viewable space */ |
1957 | } /* for x loop */ |
1560 | } /* for x loop */ |
1958 | } /* for y loop */ |
1561 | } /* for y loop */ |
1959 | |
1562 | |
1960 | /* Verify that we in fact do need to send this */ |
1563 | /* Verify that we in fact do need to send this */ |
… | |
… | |
1963 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1566 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1964 | { |
1567 | { |
1965 | /* No map data will follow, so don't say the client |
1568 | /* No map data will follow, so don't say the client |
1966 | * it doesn't need draw! |
1569 | * it doesn't need draw! |
1967 | */ |
1570 | */ |
1968 | ewhatflag &= (~EMI_NOREDRAW); |
1571 | ewhatflag &= ~EMI_NOREDRAW; |
1969 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1572 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1970 | } |
1573 | } |
1971 | |
1574 | |
1972 | if (esl.length () > estartlen) |
1575 | if (esl.length () > estartlen) |
1973 | socket.send_packet (esl); |
1576 | socket.send_packet (esl); |
… | |
… | |
1985 | */ |
1588 | */ |
1986 | void |
1589 | void |
1987 | draw_client_map (object *pl) |
1590 | draw_client_map (object *pl) |
1988 | { |
1591 | { |
1989 | int i, j; |
1592 | int i, j; |
1990 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1593 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
1991 | New_Face *face, *floor; |
|
|
1992 | New_Face *floor2; |
|
|
1993 | int d, mflags; |
1594 | int mflags; |
1994 | struct Map newmap; |
1595 | struct Map newmap; |
1995 | maptile *m, *pm; |
1596 | maptile *m, *pm; |
1996 | |
1597 | |
1997 | if (pl->type != PLAYER) |
1598 | if (pl->type != PLAYER) |
1998 | { |
1599 | { |
… | |
… | |
2009 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1610 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2010 | return; |
1611 | return; |
2011 | |
1612 | |
2012 | memset (&newmap, 0, sizeof (struct Map)); |
1613 | memset (&newmap, 0, sizeof (struct Map)); |
2013 | |
1614 | |
2014 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1615 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2015 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1616 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2016 | { |
1617 | { |
2017 | ax = i; |
1618 | ax = i; |
2018 | ay = j; |
1619 | ay = j; |
2019 | m = pm; |
1620 | m = pm; |
2020 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1621 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
… | |
… | |
2052 | |
1653 | |
2053 | /*****************************************************************************/ |
1654 | /*****************************************************************************/ |
2054 | void |
1655 | void |
2055 | send_plugin_custom_message (object *pl, char *buf) |
1656 | send_plugin_custom_message (object *pl, char *buf) |
2056 | { |
1657 | { |
2057 | pl->contr->socket->send_packet (buf); |
1658 | pl->contr->ns->send_packet (buf); |
2058 | } |
1659 | } |
2059 | |
1660 | |
2060 | /** |
1661 | /** |
2061 | * This sends the skill number to name mapping. We ignore |
1662 | * This sends the skill number to name mapping. We ignore |
2062 | * the params - we always send the same info no matter what. |
1663 | * the params - we always send the same info no matter what. |
… | |
… | |
2107 | * it then sends an updspell packet for each spell that has changed in this way |
1708 | * it then sends an updspell packet for each spell that has changed in this way |
2108 | */ |
1709 | */ |
2109 | void |
1710 | void |
2110 | esrv_update_spells (player *pl) |
1711 | esrv_update_spells (player *pl) |
2111 | { |
1712 | { |
|
|
1713 | if (!pl->ns) |
|
|
1714 | return; |
|
|
1715 | |
2112 | if (!pl->socket->monitor_spells) |
1716 | if (!pl->ns->monitor_spells) |
2113 | return; |
1717 | return; |
2114 | |
1718 | |
2115 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1719 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2116 | { |
1720 | { |
2117 | if (spell->type == SPELL) |
1721 | if (spell->type == SPELL) |
… | |
… | |
2147 | |
1751 | |
2148 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1752 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2149 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1753 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2150 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1754 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2151 | |
1755 | |
2152 | pl->socket->send_packet (sl); |
1756 | pl->ns->send_packet (sl); |
2153 | } |
1757 | } |
2154 | } |
1758 | } |
2155 | } |
1759 | } |
2156 | } |
1760 | } |
2157 | |
1761 | |
2158 | void |
1762 | void |
2159 | esrv_remove_spell (player *pl, object *spell) |
1763 | esrv_remove_spell (player *pl, object *spell) |
2160 | { |
1764 | { |
2161 | if (!pl->socket->monitor_spells) |
1765 | if (!pl->ns->monitor_spells) |
2162 | return; |
1766 | return; |
2163 | |
1767 | |
2164 | if (!pl || !spell || spell->env != pl->ob) |
1768 | if (!pl || !spell || spell->env != pl->ob) |
2165 | { |
1769 | { |
2166 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
1770 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
… | |
… | |
2169 | |
1773 | |
2170 | packet sl ("delspell"); |
1774 | packet sl ("delspell"); |
2171 | |
1775 | |
2172 | sl << uint32 (spell->count); |
1776 | sl << uint32 (spell->count); |
2173 | |
1777 | |
2174 | pl->socket->send_packet (sl); |
1778 | pl->ns->send_packet (sl); |
2175 | } |
1779 | } |
2176 | |
1780 | |
2177 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1781 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2178 | static void |
1782 | static void |
2179 | append_spell (player *pl, packet &sl, object *spell) |
1783 | append_spell (player *pl, packet &sl, object *spell) |
2180 | { |
1784 | { |
2181 | int len, i, skill = 0; |
1785 | int i, skill = 0; |
2182 | |
1786 | |
2183 | if (!(spell->name)) |
1787 | if (!(spell->name)) |
2184 | { |
1788 | { |
2185 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1789 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2186 | return; |
1790 | return; |
… | |
… | |
2198 | if (!strcmp (spell->skill, skill_names[i])) |
1802 | if (!strcmp (spell->skill, skill_names[i])) |
2199 | { |
1803 | { |
2200 | skill = i + CS_STAT_SKILLINFO; |
1804 | skill = i + CS_STAT_SKILLINFO; |
2201 | break; |
1805 | break; |
2202 | } |
1806 | } |
|
|
1807 | } |
|
|
1808 | |
|
|
1809 | // spells better have a face |
|
|
1810 | if (!spell->face) |
|
|
1811 | { |
|
|
1812 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1813 | spell->face = face_find ("burnout.x11", blank_face); |
2203 | } |
1814 | } |
2204 | |
1815 | |
2205 | /* send the current values */ |
1816 | /* send the current values */ |
2206 | sl << uint32 (spell->count) |
1817 | sl << uint32 (spell->count) |
2207 | << uint16 (spell->level) |
1818 | << uint16 (spell->level) |
… | |
… | |
2209 | << uint16 (spell->last_sp) |
1820 | << uint16 (spell->last_sp) |
2210 | << uint16 (spell->last_grace) |
1821 | << uint16 (spell->last_grace) |
2211 | << uint16 (spell->last_eat) |
1822 | << uint16 (spell->last_eat) |
2212 | << uint8 (skill) |
1823 | << uint8 (skill) |
2213 | << uint32 (spell->path_attuned) |
1824 | << uint32 (spell->path_attuned) |
2214 | << uint32 (spell->face ? spell->face->number : 0) |
1825 | << uint32 (spell->face) |
2215 | << data8 (spell->name) |
1826 | << data8 (spell->name) |
2216 | << data16 (spell->msg); |
1827 | << data16 (spell->msg); |
2217 | } |
1828 | } |
2218 | |
1829 | |
2219 | /** |
1830 | /** |
… | |
… | |
2227 | { |
1838 | { |
2228 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
1839 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2229 | return; |
1840 | return; |
2230 | } |
1841 | } |
2231 | |
1842 | |
2232 | if (!pl->socket->monitor_spells) |
1843 | if (!pl->ns->monitor_spells) |
2233 | return; |
1844 | return; |
2234 | |
1845 | |
2235 | packet sl ("addspell"); |
1846 | packet sl ("addspell"); |
2236 | |
1847 | |
2237 | if (!spell) |
1848 | if (!spell) |
2238 | { |
1849 | { |
2239 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1850 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2240 | { |
1851 | { |
2241 | /* were we to simply keep appending data here, we could exceed |
1852 | /* were we to simply keep appending data here, we could exceed |
2242 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1853 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2243 | * append_spells will always append 19 data bytes, plus 4 length |
1854 | * append_spells will always append 19 data bytes, plus 4 length |
2244 | * bytes and 3 strings (because that is the spec) so we need to |
1855 | * bytes and 3 strings (because that is the spec) so we need to |
… | |
… | |
2254 | if (spell->type != SPELL) |
1865 | if (spell->type != SPELL) |
2255 | continue; |
1866 | continue; |
2256 | |
1867 | |
2257 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1868 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2258 | { |
1869 | { |
2259 | pl->socket->send_packet (sl); |
1870 | pl->ns->send_packet (sl); |
2260 | |
1871 | |
2261 | sl.reset (); |
1872 | sl.reset (); |
2262 | sl << "addspell "; |
1873 | sl << "addspell "; |
2263 | } |
1874 | } |
2264 | |
1875 | |
… | |
… | |
2278 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1889 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2279 | fatal (0); |
1890 | fatal (0); |
2280 | } |
1891 | } |
2281 | |
1892 | |
2282 | /* finally, we can send the packet */ |
1893 | /* finally, we can send the packet */ |
2283 | pl->socket->send_packet (sl); |
1894 | pl->ns->send_packet (sl); |
2284 | } |
1895 | } |
2285 | |
1896 | |