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. |
… | |
… | |
146 | pl->ns->send_packet ("newmap"); |
138 | pl->ns->send_packet ("newmap"); |
147 | |
139 | |
148 | pl->ns->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->ns; |
147 | client &socket = *pl->ns; |
156 | object *ob = pl->ob; |
148 | object *ob = pl->ob; |
… | |
… | |
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 |
… | |
… | |
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 |
… | |
… | |
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); |
… | |
… | |
503 | if (*cp == 'x' || *cp == 'X') |
496 | if (*cp == 'x' || *cp == 'X') |
504 | { |
497 | { |
505 | y = atoi (cp + 1); |
498 | y = atoi (cp + 1); |
506 | break; |
499 | break; |
507 | } |
500 | } |
|
|
501 | |
508 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
502 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
509 | { |
503 | { |
510 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
504 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
511 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
505 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
512 | } |
506 | } |
… | |
… | |
569 | * it either has to be here or init_sockets needs to be exported. |
563 | * it either has to be here or init_sockets needs to be exported. |
570 | */ |
564 | */ |
571 | void |
565 | void |
572 | AddMeCmd (char *buf, int len, client * ns) |
566 | AddMeCmd (char *buf, int len, client * ns) |
573 | { |
567 | { |
574 | if (INVOKE_CLIENT (ADDME, ns)) |
568 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
575 | return; |
|
|
576 | |
|
|
577 | if (ns->pl || add_player (ns)) |
|
|
578 | ns->send_packet ("addme_failed"); |
|
|
579 | else |
|
|
580 | ns->send_packet ("addme_success"); |
|
|
581 | } |
569 | } |
582 | |
570 | |
583 | /** Reply to ExtendedInfos command */ |
571 | /** Reply to ExtendedInfos command */ |
584 | void |
572 | void |
585 | ToggleExtendedInfos (char *buf, int len, client * ns) |
573 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
695 | |
683 | |
696 | ns->send_packet (cmdback); |
684 | ns->send_packet (cmdback); |
697 | } |
685 | } |
698 | |
686 | |
699 | /** |
687 | /** |
700 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
|
|
701 | * Basically, it makes no sense to wait for the client to request a |
|
|
702 | * a piece of data from us that we know the client wants. So |
|
|
703 | * if we know the client wants it, might as well push it to the |
|
|
704 | * client. |
|
|
705 | */ |
|
|
706 | static void |
|
|
707 | SendSmooth (client *ns, uint16 face) |
|
|
708 | { |
|
|
709 | uint16 smoothface; |
|
|
710 | |
|
|
711 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
712 | * again. |
|
|
713 | */ |
|
|
714 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
|
|
715 | { |
|
|
716 | |
|
|
717 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
|
|
718 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
719 | return; |
|
|
720 | } |
|
|
721 | |
|
|
722 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
723 | esrv_send_face (ns, smoothface, 0); |
|
|
724 | |
|
|
725 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
726 | |
|
|
727 | packet sl ("smooth"); |
|
|
728 | |
|
|
729 | sl << uint16 (face) |
|
|
730 | << uint16 (smoothface); |
|
|
731 | |
|
|
732 | ns->send_packet (sl); |
|
|
733 | } |
|
|
734 | |
|
|
735 | /** |
|
|
736 | * Tells client the picture it has to use |
688 | * Tells client the picture it has to use |
737 | * to smooth a picture number given as argument. |
689 | * to smooth a picture number given as argument. |
738 | */ |
690 | */ |
739 | void |
691 | void |
740 | AskSmooth (char *buf, int len, client *ns) |
692 | AskSmooth (char *buf, int len, client *ns) |
741 | { |
693 | { |
742 | SendSmooth (ns, atoi (buf)); |
694 | ns->send_smooth (atoi (buf)); |
743 | } |
695 | } |
744 | |
696 | |
745 | /** |
697 | /** |
746 | * This handles the general commands from the client (ie, north, fire, cast, |
698 | * This handles the general commands from the client (ie, north, fire, cast, |
747 | * etc.) |
699 | * etc.) |
… | |
… | |
806 | * commands. |
758 | * commands. |
807 | */ |
759 | */ |
808 | pl->count = 0; |
760 | pl->count = 0; |
809 | |
761 | |
810 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
762 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
811 | int time = FABS (pl->ob->speed) < 0.001 |
763 | int time = fabs (pl->ob->speed) < 0.001 |
812 | ? time = MAX_TIME * 100 |
764 | ? time = MAX_TIME * 100 |
813 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
765 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
814 | |
766 | |
815 | /* Send confirmation of command execution now */ |
767 | /* Send confirmation of command execution now */ |
816 | packet sl ("comc"); |
768 | packet sl ("comc"); |
817 | sl << uint16 (cmdid) << uint32 (time); |
769 | sl << uint16 (cmdid) << uint32 (time); |
818 | pl->ns->send_packet (sl); |
770 | pl->ns->send_packet (sl); |
… | |
… | |
850 | { |
802 | { |
851 | case ST_PLAYING: |
803 | case ST_PLAYING: |
852 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
804 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
853 | break; |
805 | break; |
854 | |
806 | |
855 | case ST_PLAY_AGAIN: |
|
|
856 | /* We can check this for return value (2==quit). Maybe we |
|
|
857 | * should, and do something appropriate? |
|
|
858 | */ |
|
|
859 | receive_play_again (pl->ob, buf[0]); |
|
|
860 | break; |
|
|
861 | |
|
|
862 | case ST_ROLL_STAT: |
|
|
863 | key_roll_stat (pl->ob, buf[0]); |
|
|
864 | break; |
|
|
865 | |
|
|
866 | case ST_CHANGE_CLASS: |
807 | case ST_CHANGE_CLASS: |
867 | key_change_class (pl->ob, buf[0]); |
808 | key_change_class (pl->ob, buf[0]); |
868 | break; |
|
|
869 | |
|
|
870 | case ST_CONFIRM_QUIT: |
|
|
871 | key_confirm_quit (pl->ob, buf[0]); |
|
|
872 | break; |
|
|
873 | |
|
|
874 | case ST_CONFIGURE: |
|
|
875 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
876 | ns->state = ST_PLAYING; |
|
|
877 | break; |
|
|
878 | |
|
|
879 | case ST_GET_NAME: |
|
|
880 | receive_player_name (pl->ob, 13); |
|
|
881 | break; |
|
|
882 | |
|
|
883 | case ST_GET_PASSWORD: |
|
|
884 | case ST_CONFIRM_PASSWORD: |
|
|
885 | receive_player_password (pl->ob, 13); |
|
|
886 | break; |
809 | break; |
887 | |
810 | |
888 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
811 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
889 | receive_party_password (pl->ob, 13); |
812 | receive_party_password (pl->ob, 13); |
890 | break; |
813 | break; |
… | |
… | |
913 | ns->cs_version = atoi (buf); |
836 | ns->cs_version = atoi (buf); |
914 | ns->sc_version = ns->cs_version; |
837 | ns->sc_version = ns->cs_version; |
915 | |
838 | |
916 | LOG (llevDebug, "connection from client <%s>\n", buf); |
839 | LOG (llevDebug, "connection from client <%s>\n", buf); |
917 | |
840 | |
918 | |
|
|
919 | //TODO: should log here just for statistics |
841 | //TODO: should log here just for statistics |
920 | |
842 | |
921 | //if (VERSION_CS != ns->cs_version) |
843 | //if (VERSION_CS != ns->cs_version) |
922 | // unchecked; |
844 | // unchecked; |
923 | |
845 | |
… | |
… | |
948 | { |
870 | { |
949 | ns->sound = atoi (buf); |
871 | ns->sound = atoi (buf); |
950 | } |
872 | } |
951 | |
873 | |
952 | /** client wants the map resent */ |
874 | /** client wants the map resent */ |
953 | |
|
|
954 | void |
875 | void |
955 | MapRedrawCmd (char *buf, int len, player *pl) |
876 | MapRedrawCmd (char *buf, int len, player *pl) |
956 | { |
877 | { |
957 | /* This function is currently disabled; just clearing the map state results in |
878 | /* This function is currently disabled; just clearing the map state results in |
958 | * display errors. It should clear the cache and send a newmap command. |
879 | * display errors. It should clear the cache and send a newmap command. |
… | |
… | |
1045 | esrv_update_stats (player *pl) |
966 | esrv_update_stats (player *pl) |
1046 | { |
967 | { |
1047 | char buf[MAX_BUF]; |
968 | char buf[MAX_BUF]; |
1048 | uint16 flags; |
969 | uint16 flags; |
1049 | |
970 | |
|
|
971 | client *ns = pl->ns; |
|
|
972 | if (!ns) |
|
|
973 | return; |
|
|
974 | |
|
|
975 | object *ob = pl->ob; |
|
|
976 | if (!ob) |
|
|
977 | return; |
|
|
978 | |
1050 | packet sl ("stats"); |
979 | packet sl ("stats"); |
1051 | |
980 | |
1052 | if (pl->ob) |
|
|
1053 | { |
|
|
1054 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
981 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1055 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
982 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1056 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
983 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1057 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
984 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1058 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
985 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1059 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
986 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1060 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
987 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1061 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1062 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1063 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1064 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
988 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1065 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
989 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
990 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
991 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
992 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1066 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
993 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1067 | } |
|
|
1068 | |
994 | |
1069 | if (pl->ns->exp64) |
|
|
1070 | for (int s = 0; s < NUM_SKILLS; s++) |
995 | for (int s = 0; s < NUM_SKILLS; s++) |
1071 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
996 | if (object *skill = pl->last_skill_ob[s]) |
|
|
997 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1072 | { |
998 | { |
|
|
999 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1000 | |
1073 | /* Always send along the level if exp changes. This is only |
1001 | /* Always send along the level if exp changes. This is only |
1074 | * 1 extra byte, but keeps processing simpler. |
1002 | * 1 extra byte, but keeps processing simpler. |
1075 | */ |
1003 | */ |
1076 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1004 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1077 | << uint8 (pl->last_skill_ob[s]->level) |
1005 | << uint8 (skill->level) |
1078 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1006 | << uint64 (skill->stats.exp); |
1079 | |
|
|
1080 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1081 | } |
1007 | } |
1082 | |
1008 | |
1083 | if (pl->ns->exp64) |
|
|
1084 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1009 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1085 | else |
|
|
1086 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1087 | |
|
|
1088 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1010 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1089 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1011 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1090 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1012 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1091 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1013 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1092 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1014 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1093 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1015 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1094 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1016 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1095 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1017 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1018 | |
1096 | flags = 0; |
1019 | flags = 0; |
1097 | |
1020 | |
1098 | if (pl->fire_on) |
1021 | if (pl->fire_on) |
1099 | flags |= SF_FIREON; |
1022 | flags |= SF_FIREON; |
1100 | |
1023 | |
1101 | if (pl->run_on) |
1024 | if (pl->run_on) |
1102 | flags |= SF_RUNON; |
1025 | flags |= SF_RUNON; |
1103 | |
1026 | |
1104 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1027 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1105 | |
1028 | |
1106 | if (pl->ns->sc_version < 1025) |
1029 | if (ns->sc_version < 1025) |
1107 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1030 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1108 | else |
1031 | else |
1109 | for (int i = 0; i < NROFATTACKS; i++) |
1032 | for (int i = 0; i < NROFATTACKS; i++) |
1110 | { |
1033 | { |
1111 | /* Skip ones we won't send */ |
1034 | /* Skip ones we won't send */ |
1112 | if (atnr_cs_stat[i] == -1) |
1035 | if (atnr_cs_stat[i] == -1) |
1113 | continue; |
1036 | continue; |
1114 | |
1037 | |
1115 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1038 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1116 | } |
1039 | } |
1117 | |
1040 | |
1118 | if (pl->ns->monitor_spells) |
1041 | if (pl->ns->monitor_spells) |
1119 | { |
1042 | { |
1120 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1043 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1121 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1044 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1122 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1045 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1123 | } |
1046 | } |
1124 | |
1047 | |
1125 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1048 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1126 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1049 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1127 | set_title (pl->ob, buf); |
1050 | set_title (ob, buf); |
1128 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1051 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1129 | |
1052 | |
1130 | /* Only send it away if we have some actual data */ |
1053 | /* Only send it away if we have some actual data */ |
1131 | if (sl.length () > 6) |
1054 | if (sl.length () > 6) |
1132 | pl->ns->send_packet (sl); |
1055 | ns->send_packet (sl); |
1133 | } |
1056 | } |
1134 | |
1057 | |
1135 | /** |
1058 | /** |
1136 | * Tells the client that here is a player it should start using. |
1059 | * Tells the client that here is a player it should start using. |
1137 | */ |
1060 | */ |
1138 | void |
1061 | void |
1139 | esrv_new_player (player *pl, uint32 weight) |
1062 | esrv_new_player (player *pl, uint32 weight) |
1140 | { |
1063 | { |
1141 | pl->last_weight = weight; |
|
|
1142 | |
|
|
1143 | packet sl ("player"); |
1064 | packet sl ("player"); |
1144 | |
1065 | |
1145 | sl << uint32 (pl->ob->count) |
1066 | sl << uint32 (pl->ob->count) |
1146 | << uint32 (weight) |
1067 | << uint32 (weight) |
1147 | << uint32 (pl->ob->face->number) |
1068 | << uint32 (pl->ob->face) |
1148 | << data8 (pl->ob->name); |
1069 | << data8 (pl->ob->name); |
1149 | |
1070 | |
|
|
1071 | pl->ns->last_weight = weight; |
1150 | pl->ns->send_packet (sl); |
1072 | pl->ns->send_packet (sl); |
1151 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1073 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1152 | } |
1074 | } |
1153 | |
|
|
1154 | /** |
|
|
1155 | * Need to send an animation sequence to the client. |
|
|
1156 | * We will send appropriate face commands to the client if we haven't |
|
|
1157 | * sent them the face yet (this can become quite costly in terms of |
|
|
1158 | * how much we are sending - on the other hand, this should only happen |
|
|
1159 | * when the player logs in and picks stuff up. |
|
|
1160 | */ |
|
|
1161 | void |
|
|
1162 | esrv_send_animation (client * ns, short anim_num) |
|
|
1163 | { |
|
|
1164 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1165 | * are added in contigous order, so if the number is in the valid |
|
|
1166 | * range, it must be a valid animation. |
|
|
1167 | */ |
|
|
1168 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1169 | { |
|
|
1170 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1171 | return; |
|
|
1172 | } |
|
|
1173 | |
|
|
1174 | packet sl ("anim"); |
|
|
1175 | |
|
|
1176 | sl << uint16 (anim_num) |
|
|
1177 | << uint16 (0); /* flags - not used right now */ |
|
|
1178 | |
|
|
1179 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1180 | * the face itself) down to the client. |
|
|
1181 | */ |
|
|
1182 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1183 | { |
|
|
1184 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1185 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1186 | |
|
|
1187 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1188 | } |
|
|
1189 | |
|
|
1190 | ns->send_packet (sl); |
|
|
1191 | |
|
|
1192 | ns->anims_sent[anim_num] = 1; |
|
|
1193 | } |
|
|
1194 | |
|
|
1195 | |
1075 | |
1196 | /****************************************************************************** |
1076 | /****************************************************************************** |
1197 | * |
1077 | * |
1198 | * Start of map related commands. |
1078 | * Start of map related commands. |
1199 | * |
1079 | * |
1200 | ******************************************************************************/ |
1080 | ******************************************************************************/ |
1201 | |
1081 | |
1202 | /** |
|
|
1203 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1204 | * the face yet, we will also send it. |
|
|
1205 | */ |
|
|
1206 | static void |
|
|
1207 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1208 | { |
|
|
1209 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1210 | { |
|
|
1211 | //TODO: one or the other, can't both have abort and return, verify and act |
|
|
1212 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1213 | return; |
|
|
1214 | abort (); |
|
|
1215 | } |
|
|
1216 | |
|
|
1217 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1218 | newmap->cells[x][y].count++; |
|
|
1219 | |
|
|
1220 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1221 | esrv_send_face (ns, face_num, 0); |
|
|
1222 | } |
|
|
1223 | |
|
|
1224 | /** Clears a map cell */ |
1082 | /** Clears a map cell */ |
1225 | static void |
1083 | static void |
1226 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1084 | map_clearcell (struct MapCell *cell, int count) |
1227 | { |
1085 | { |
1228 | cell->faces[0] = face0; |
1086 | cell->faces[0] = 0; |
1229 | cell->faces[1] = face1; |
1087 | cell->faces[1] = 0; |
1230 | cell->faces[2] = face2; |
1088 | cell->faces[2] = 0; |
1231 | cell->count = count; |
1089 | cell->count = count; |
1232 | cell->stat_hp = 0; |
1090 | cell->stat_hp = 0; |
1233 | cell->flags = 0; |
1091 | cell->flags = 0; |
1234 | cell->player = 0; |
1092 | cell->player = 0; |
1235 | } |
1093 | } |
1236 | |
1094 | |
1237 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1238 | #define MAX_LAYERS 3 |
1095 | #define MAX_LAYERS 3 |
1239 | |
|
|
1240 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1241 | * allocating and deallocating such a block of data each time run through, |
|
|
1242 | * and saves the space of allocating this in the socket object when we only |
|
|
1243 | * need it for this cycle. If the server is ever threaded, this needs to be |
|
|
1244 | * re-examined. |
|
|
1245 | */ |
|
|
1246 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1247 | |
|
|
1248 | /** |
|
|
1249 | * Returns true if any of the heads for this |
|
|
1250 | * space is set. Returns false if all are blank - this is used |
|
|
1251 | * for empty space checking. |
|
|
1252 | */ |
|
|
1253 | static inline int |
|
|
1254 | have_head (int ax, int ay) |
|
|
1255 | { |
|
|
1256 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1257 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1258 | return 1; |
|
|
1259 | |
|
|
1260 | return 0; |
|
|
1261 | } |
|
|
1262 | |
|
|
1263 | /** |
|
|
1264 | * check_head is a bit simplistic version of update_space below. |
|
|
1265 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1266 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1267 | * if needed, and returning 1. If this no data needs to get |
|
|
1268 | * sent, it returns zero. |
|
|
1269 | */ |
|
|
1270 | static int |
|
|
1271 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
|
|
1272 | { |
|
|
1273 | short face_num; |
|
|
1274 | |
|
|
1275 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1276 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1277 | else |
|
|
1278 | face_num = 0; |
|
|
1279 | |
|
|
1280 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1281 | { |
|
|
1282 | sl << uint16 (face_num); |
|
|
1283 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1284 | esrv_send_face (&ns, face_num, 0); |
|
|
1285 | |
|
|
1286 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1287 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1288 | return 1; |
|
|
1289 | } |
|
|
1290 | |
|
|
1291 | return 0; /* No change */ |
|
|
1292 | } |
|
|
1293 | |
1096 | |
1294 | /** |
1097 | /** |
1295 | * Removes the need to replicate the same code for each layer. |
1098 | * Removes the need to replicate the same code for each layer. |
1296 | * this returns true if this space is now in fact different than |
1099 | * this returns true if this space is now in fact different than |
1297 | * it was. |
1100 | * it was. |
… | |
… | |
1311 | * actually match. |
1114 | * actually match. |
1312 | */ |
1115 | */ |
1313 | static int |
1116 | static int |
1314 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1117 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1315 | { |
1118 | { |
1316 | object *ob, *head; |
|
|
1317 | uint16 face_num; |
1119 | uint16 face_num; |
1318 | int bx, by, i; |
1120 | int bx, by, i; |
1319 | |
1121 | |
1320 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1321 | * If not, then do the normal processing. |
|
|
1322 | */ |
|
|
1323 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1324 | |
|
|
1325 | /* Check to see if this head is part of the set of objects |
|
|
1326 | * we would normally send for this space. If so, then |
|
|
1327 | * don't use the head value. We need to do the check |
|
|
1328 | * here and not when setting up the heads[] value for two reasons - |
|
|
1329 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1330 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1331 | * rather not need to do the map translation overhead. |
|
|
1332 | * 3) We need to do some extra checking to make sure that we will |
|
|
1333 | * otherwise send the image as this layer, eg, either it matches |
|
|
1334 | * the head value, or is not multipart. |
|
|
1335 | */ |
|
|
1336 | if (head && !head->more) |
|
|
1337 | { |
|
|
1338 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1339 | { |
|
|
1340 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1341 | if (!ob) |
|
|
1342 | continue; |
|
|
1343 | |
|
|
1344 | if (ob->head) |
|
|
1345 | ob = ob->head; |
|
|
1346 | |
|
|
1347 | if (ob == head) |
|
|
1348 | { |
|
|
1349 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1350 | head = NULL; |
|
|
1351 | break; |
|
|
1352 | } |
|
|
1353 | } |
|
|
1354 | } |
|
|
1355 | |
|
|
1356 | ob = head; |
|
|
1357 | if (!ob) |
|
|
1358 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1122 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1359 | |
1123 | |
1360 | /* If there is no object for this space, or if the face for the object |
1124 | /* If there is no object for this space, or if the face for the object |
1361 | * is the blank face, set the face number to zero. |
1125 | * is the blank face, set the face number to zero. |
1362 | * else if we have the stored head object for this space, that takes |
1126 | * else if we have the stored head object for this space, that takes |
1363 | * precedence over the other object for this space. |
1127 | * precedence over the other object for this space. |
1364 | * otherwise, we do special head processing |
1128 | * otherwise, we do special head processing |
1365 | */ |
1129 | */ |
1366 | if (!ob || ob->face == blank_face) |
1130 | if (!ob || ob->face == blank_face) |
1367 | face_num = 0; |
1131 | face_num = 0; |
1368 | else if (head) |
|
|
1369 | { |
|
|
1370 | /* if this is a head that had previously been stored */ |
|
|
1371 | face_num = ob->face->number; |
|
|
1372 | } |
|
|
1373 | else |
1132 | else |
1374 | { |
|
|
1375 | /* if the faces for the different parts of a multipart object |
|
|
1376 | * are the same, we only want to send the bottom right most |
|
|
1377 | * portion of the object. That info is in the tail_.. values |
|
|
1378 | * of the head. Note that for the head itself, ob->head will |
|
|
1379 | * be null, so we only do this block if we are working on |
|
|
1380 | * a tail piece. |
|
|
1381 | */ |
|
|
1382 | |
|
|
1383 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1384 | * this is the head object and these are set, we proceed |
|
|
1385 | * with logic to only send bottom right. Similarly, if |
|
|
1386 | * this is one of the more parts but the head has those values |
|
|
1387 | * set, we want to do the processing. There can be cases where |
|
|
1388 | * the head is not visible but one of its parts is, so we just |
|
|
1389 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1390 | * object we may want to display. |
|
|
1391 | */ |
|
|
1392 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1393 | { |
|
|
1394 | |
|
|
1395 | if (ob->head) |
|
|
1396 | head = ob->head; |
|
|
1397 | else |
|
|
1398 | head = ob; |
|
|
1399 | |
|
|
1400 | /* Basically figure out where the offset is from where we are right |
|
|
1401 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1402 | * piece is from the head, and the tail is where the tail is from the |
|
|
1403 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1404 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1405 | * will be zero, so the right thing will still happen. |
|
|
1406 | */ |
|
|
1407 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1408 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1409 | |
|
|
1410 | /* I don't think this can ever happen, but better to check for it just |
|
|
1411 | * in case. |
|
|
1412 | */ |
|
|
1413 | if (bx < sx || by < sy) |
|
|
1414 | { |
|
|
1415 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1416 | face_num = 0; |
|
|
1417 | } |
|
|
1418 | /* single part object, multipart object with non merged faces, |
|
|
1419 | * of multipart object already at lower right. |
|
|
1420 | */ |
|
|
1421 | else if (bx == sx && by == sy) |
|
|
1422 | { |
|
|
1423 | face_num = ob->face->number; |
|
|
1424 | |
|
|
1425 | /* if this face matches one stored away, clear that one away. |
|
|
1426 | * this code relies on the fact that the map1 commands |
|
|
1427 | * goes from 2 down to 0. |
|
|
1428 | */ |
|
|
1429 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1430 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1431 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1432 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1433 | } |
|
|
1434 | else |
|
|
1435 | { |
|
|
1436 | /* If this head is stored away, clear it - otherwise, |
|
|
1437 | * there can be cases where a object is on multiple layers - |
|
|
1438 | * we only want to send it once. |
|
|
1439 | */ |
|
|
1440 | face_num = head->face->number; |
|
|
1441 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1442 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1443 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1444 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1445 | |
|
|
1446 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1447 | * then find another layer. |
|
|
1448 | */ |
|
|
1449 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1450 | { |
|
|
1451 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1452 | } |
|
|
1453 | else |
|
|
1454 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1455 | { |
|
|
1456 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1457 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1458 | { |
|
|
1459 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1460 | } |
|
|
1461 | } |
|
|
1462 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1463 | } |
|
|
1464 | } |
|
|
1465 | else |
|
|
1466 | { |
|
|
1467 | /* In this case, we are already at the lower right or single part object, |
1133 | /* In this case, we are already at the lower right or single part object, |
1468 | * so nothing special |
1134 | * so nothing special |
1469 | */ |
|
|
1470 | face_num = ob->face->number; |
|
|
1471 | |
|
|
1472 | /* clear out any head entries that have the same face as this one */ |
|
|
1473 | for (bx = 0; bx < layer; bx++) |
|
|
1474 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1475 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1476 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1477 | } |
|
|
1478 | } /* else not already head object or blank face */ |
|
|
1479 | |
|
|
1480 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1481 | * but there is a head on the next layer, send that instead. |
|
|
1482 | * Without this, what happens is you can get the case where the player stands |
|
|
1483 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1484 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1485 | * This tends to make stacking also work/look better. |
|
|
1486 | */ |
1135 | */ |
1487 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1488 | { |
|
|
1489 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1490 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1491 | } |
|
|
1492 | |
|
|
1493 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1494 | * we already sent for a lower layer. In that case, don't send |
|
|
1495 | * this one. |
|
|
1496 | */ |
|
|
1497 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1498 | face_num = 0; |
1136 | face_num = ob->face; |
1499 | |
1137 | |
1500 | /* We've gotten what face we want to use for the object. Now see if |
1138 | /* We've gotten what face we want to use for the object. Now see if |
1501 | * if it has changed since we last sent it to the client. |
1139 | * if it has changed since we last sent it to the client. |
1502 | */ |
1140 | */ |
1503 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1141 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1504 | { |
1142 | { |
1505 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1143 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
|
|
1144 | |
1506 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1145 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1146 | if (ob) |
|
|
1147 | ns.send_faces (ob); |
|
|
1148 | else |
1507 | esrv_send_face (&ns, face_num, 0); |
1149 | ns.send_face (face_num); |
1508 | |
1150 | |
1509 | sl << uint16 (face_num); |
1151 | sl << uint16 (face_num); |
1510 | return 1; |
1152 | return 1; |
1511 | } |
1153 | } |
1512 | |
1154 | |
… | |
… | |
1530 | * holds the old values. |
1172 | * holds the old values. |
1531 | * layer is the layer to update, with 2 being the floor and 0 the |
1173 | * layer is the layer to update, with 2 being the floor and 0 the |
1532 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1174 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1533 | * take. |
1175 | * take. |
1534 | */ |
1176 | */ |
1535 | |
|
|
1536 | static inline int |
1177 | static inline int |
1537 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1178 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1538 | { |
1179 | { |
1539 | object *ob; |
|
|
1540 | int smoothlevel; /* old face_num; */ |
|
|
1541 | |
|
|
1542 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1180 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1543 | |
1181 | |
1544 | /* If there is no object for this space, or if the face for the object |
1182 | /* If there is no object for this space, or if the face for the object |
1545 | * is the blank face, set the smoothlevel to zero. |
1183 | * is the blank face, set the smoothlevel to zero. |
1546 | */ |
1184 | */ |
1547 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1185 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
1548 | smoothlevel = 0; |
|
|
1549 | else |
|
|
1550 | { |
|
|
1551 | smoothlevel = ob->smoothlevel; |
|
|
1552 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1553 | SendSmooth (&ns, ob->face->number); |
|
|
1554 | } /* else not already head object or blank face */ |
|
|
1555 | |
1186 | |
1556 | /* We've gotten what face we want to use for the object. Now see if |
1187 | /* We've gotten what face we want to use for the object. Now see if |
1557 | * if it has changed since we last sent it to the client. |
1188 | * if it has changed since we last sent it to the client. |
1558 | */ |
1189 | */ |
1559 | if (smoothlevel > 255) |
1190 | if (smoothlevel > 255) |
… | |
… | |
1561 | else if (smoothlevel < 0) |
1192 | else if (smoothlevel < 0) |
1562 | smoothlevel = 0; |
1193 | smoothlevel = 0; |
1563 | |
1194 | |
1564 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1195 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1565 | { |
1196 | { |
|
|
1197 | if (smoothlevel) |
|
|
1198 | ns.send_smooth (ob->face); |
|
|
1199 | |
1566 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1200 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1567 | sl << uint8 (smoothlevel); |
1201 | sl << uint8 (smoothlevel); |
1568 | return 1; |
1202 | return 1; |
1569 | } |
1203 | } |
1570 | |
1204 | |
… | |
… | |
1587 | if (ns->EMI_smooth) |
1221 | if (ns->EMI_smooth) |
1588 | result += 1; /*One byte for smoothlevel */ |
1222 | result += 1; /*One byte for smoothlevel */ |
1589 | } |
1223 | } |
1590 | |
1224 | |
1591 | return result; |
1225 | return result; |
|
|
1226 | } |
|
|
1227 | |
|
|
1228 | // prefetch (and touch) all maps within a specific distancd |
|
|
1229 | static void |
|
|
1230 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1231 | { |
|
|
1232 | map->last_access = runtime; |
|
|
1233 | |
|
|
1234 | if (--distance) |
|
|
1235 | for (int dir = 4; --dir; ) |
|
|
1236 | if (const shstr &path = map->tile_path [dir]) |
|
|
1237 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1238 | prefetch_surrounding_maps (neigh, distance); |
|
|
1239 | else |
|
|
1240 | neigh = maptile::find_async (path, map); |
|
|
1241 | } |
|
|
1242 | |
|
|
1243 | // prefetch a generous area around the player |
|
|
1244 | static void |
|
|
1245 | prefetch_surrounding_maps (object *op) |
|
|
1246 | { |
|
|
1247 | prefetch_surrounding_maps (op->map, 3); |
1592 | } |
1248 | } |
1593 | |
1249 | |
1594 | /** |
1250 | /** |
1595 | * This function uses the new map1 protocol command to send the map |
1251 | * This function uses the new map1 protocol command to send the map |
1596 | * to the client. It is necessary because the old map command supports |
1252 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1614 | * look like. |
1270 | * look like. |
1615 | */ |
1271 | */ |
1616 | void |
1272 | void |
1617 | draw_client_map1 (object *pl) |
1273 | draw_client_map1 (object *pl) |
1618 | { |
1274 | { |
1619 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1275 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1620 | sint16 nx, ny; |
1276 | sint16 nx, ny; |
1621 | int estartlen, eoldlen; |
1277 | int estartlen, eoldlen; |
1622 | uint16 mask, emask; |
|
|
1623 | uint8 eentrysize; |
1278 | uint8 eentrysize; |
1624 | uint16 ewhatstart, ewhatflag; |
1279 | uint16 ewhatstart, ewhatflag; |
1625 | uint8 extendedinfos; |
1280 | uint8 extendedinfos; |
1626 | maptile *m; |
1281 | maptile *m; |
1627 | |
1282 | |
1628 | client &socket = *pl->contr->ns; |
1283 | client &socket = *pl->contr->ns; |
1629 | |
1284 | |
|
|
1285 | if (!pl->active) |
|
|
1286 | return; |
|
|
1287 | |
1630 | check_map_change (pl->contr); |
1288 | check_map_change (pl->contr); |
|
|
1289 | prefetch_surrounding_maps (pl); |
1631 | |
1290 | |
1632 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1291 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1633 | packet esl; |
1292 | packet esl; |
1634 | |
1293 | |
1635 | startlen = sl.length (); |
1294 | startlen = sl.length (); |
… | |
… | |
1658 | ewhatstart = 0; |
1317 | ewhatstart = 0; |
1659 | ewhatflag = 0; |
1318 | ewhatflag = 0; |
1660 | estartlen = 0; |
1319 | estartlen = 0; |
1661 | } |
1320 | } |
1662 | |
1321 | |
1663 | /* Init data to zero */ |
|
|
1664 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1665 | |
|
|
1666 | /* x,y are the real map locations. ax, ay are viewport relative |
1322 | /* x,y are the real map locations. ax, ay are viewport relative |
1667 | * locations. |
1323 | * locations. |
1668 | */ |
1324 | */ |
1669 | ay = 0; |
1325 | ay = 0; |
1670 | |
1326 | |
… | |
… | |
1672 | * but that started to get a bit messy to look at. |
1328 | * but that started to get a bit messy to look at. |
1673 | */ |
1329 | */ |
1674 | max_x = pl->x + (socket.mapx + 1) / 2; |
1330 | max_x = pl->x + (socket.mapx + 1) / 2; |
1675 | max_y = pl->y + (socket.mapy + 1) / 2; |
1331 | max_y = pl->y + (socket.mapy + 1) / 2; |
1676 | |
1332 | |
1677 | if (socket.mapmode == Map1aCmd) |
|
|
1678 | { |
|
|
1679 | max_x += MAX_HEAD_OFFSET; |
|
|
1680 | max_y += MAX_HEAD_OFFSET; |
|
|
1681 | } |
|
|
1682 | |
|
|
1683 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1333 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1684 | { |
1334 | { |
1685 | ax = 0; |
1335 | ax = 0; |
1686 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1336 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1687 | { |
1337 | { |
|
|
1338 | int emask, mask; |
1688 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1339 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1689 | |
1340 | |
1690 | /* If this space is out of the normal viewable area, we only check |
|
|
1691 | * the heads value ax or ay will only be greater than what |
|
|
1692 | * the client wants if using the map1a command - this is because |
|
|
1693 | * if the map1a command is not used, max_x and max_y will be |
|
|
1694 | * set to lower values. |
|
|
1695 | */ |
|
|
1696 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1697 | { |
|
|
1698 | int i, got_one; |
|
|
1699 | |
|
|
1700 | oldlen = sl.length (); |
|
|
1701 | |
|
|
1702 | sl << uint16 (mask); |
|
|
1703 | |
|
|
1704 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1705 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1706 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1707 | |
|
|
1708 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1709 | * actually need to send that - just the coordinates |
|
|
1710 | * with no faces tells the client to blank out the |
|
|
1711 | * space. |
|
|
1712 | */ |
|
|
1713 | got_one = 0; |
|
|
1714 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1715 | if (sl[i]) |
|
|
1716 | got_one = 1; |
|
|
1717 | |
|
|
1718 | if (got_one && (mask & 0xf)) |
|
|
1719 | sl[oldlen + 1] = mask & 0xff; |
|
|
1720 | else |
|
|
1721 | { /*either all faces blank, either no face at all */ |
|
|
1722 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1723 | sl.reset (oldlen + 2); |
|
|
1724 | else |
|
|
1725 | sl.reset (oldlen); |
|
|
1726 | } |
|
|
1727 | |
|
|
1728 | /*What concerns extendinfos, nothing to be done for now |
|
|
1729 | * (perhaps effects layer later) |
|
|
1730 | */ |
|
|
1731 | continue; /* don't do processing below */ |
|
|
1732 | } |
|
|
1733 | |
|
|
1734 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1341 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1735 | |
|
|
1736 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1737 | |
1342 | |
1738 | /* If the coordinates are not valid, or it is too dark to see, |
1343 | /* If the coordinates are not valid, or it is too dark to see, |
1739 | * we tell the client as such |
1344 | * we tell the client as such |
1740 | */ |
1345 | */ |
1741 | nx = x; |
1346 | nx = x; |
… | |
… | |
1749 | * of the map, it shouldn't have a head |
1354 | * of the map, it shouldn't have a head |
1750 | */ |
1355 | */ |
1751 | if (lastcell.count != -1) |
1356 | if (lastcell.count != -1) |
1752 | { |
1357 | { |
1753 | sl << uint16 (mask); |
1358 | sl << uint16 (mask); |
1754 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1359 | map_clearcell (&lastcell, -1); |
1755 | } |
1360 | } |
|
|
1361 | |
|
|
1362 | continue; |
1756 | } |
1363 | } |
|
|
1364 | |
|
|
1365 | m->touch (); |
|
|
1366 | |
|
|
1367 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1368 | |
1757 | else if (d > 3) |
1369 | if (d > 3) |
1758 | { |
1370 | { |
|
|
1371 | |
1759 | int need_send = 0, count; |
1372 | int need_send = 0, count; |
1760 | |
1373 | |
1761 | /* This block deals with spaces that are not visible for whatever |
1374 | /* This block deals with spaces that are not visible for whatever |
1762 | * reason. Still may need to send the head for this space. |
1375 | * reason. Still may need to send the head for this space. |
1763 | */ |
1376 | */ |
1764 | |
1377 | |
1765 | oldlen = sl.length (); |
1378 | oldlen = sl.length (); |
1766 | |
1379 | |
1767 | sl << uint16 (mask); |
1380 | sl << uint16 (mask); |
… | |
… | |
1769 | if (lastcell.count != -1) |
1382 | if (lastcell.count != -1) |
1770 | need_send = 1; |
1383 | need_send = 1; |
1771 | |
1384 | |
1772 | count = -1; |
1385 | count = -1; |
1773 | |
1386 | |
1774 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1775 | { |
|
|
1776 | /* Now check to see if any heads need to be sent */ |
|
|
1777 | |
|
|
1778 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1779 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1780 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1781 | |
|
|
1782 | lastcell.count = count; |
|
|
1783 | } |
|
|
1784 | else |
|
|
1785 | { |
|
|
1786 | /* properly clear a previously sent big face */ |
1387 | /* properly clear a previously sent big face */ |
1787 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1388 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1788 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1389 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1789 | need_send = 1; |
1390 | need_send = 1; |
1790 | |
1391 | |
1791 | map_clearcell (&lastcell, 0, 0, 0, count); |
1392 | map_clearcell (&lastcell, count); |
1792 | } |
|
|
1793 | |
1393 | |
1794 | if ((mask & 0xf) || need_send) |
1394 | if ((mask & 0xf) || need_send) |
1795 | sl[oldlen + 1] = mask & 0xff; |
1395 | sl[oldlen + 1] = mask & 0xff; |
1796 | else |
1396 | else |
1797 | sl.reset (oldlen); |
1397 | sl.reset (oldlen); |
1798 | } |
1398 | } |
1799 | else |
1399 | else |
1800 | { |
1400 | { |
1801 | /* In this block, the space is visible or there are head objects |
1401 | /* In this block, the space is visible. |
1802 | * we need to send. |
|
|
1803 | */ |
1402 | */ |
1804 | |
1403 | |
1805 | /* Rather than try to figure out what everything that we might |
1404 | /* Rather than try to figure out what everything that we might |
1806 | * need to send is, then form the packet after that, |
1405 | * need to send is, then form the packet after that, |
1807 | * we presume that we will in fact form a packet, and update |
1406 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1810 | * is done. |
1409 | * is done. |
1811 | * I think this is simpler than doing a bunch of checks to see |
1410 | * I think this is simpler than doing a bunch of checks to see |
1812 | * what if anything we need to send, setting the bits, then |
1411 | * what if anything we need to send, setting the bits, then |
1813 | * doing those checks again to add the real data. |
1412 | * doing those checks again to add the real data. |
1814 | */ |
1413 | */ |
1815 | oldlen = sl.length (); |
1414 | oldlen = sl.length (); |
1816 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1817 | eoldlen = esl.length (); |
1415 | eoldlen = esl.length (); |
1818 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1416 | |
1819 | sl << uint16 (mask); |
1417 | sl << uint16 (mask); |
1820 | |
1418 | |
1821 | if (socket.ext_mapinfos) |
1419 | if (socket.ext_mapinfos) |
1822 | esl << uint16 (emask); |
1420 | esl << uint16 (emask); |
1823 | |
1421 | |
… | |
… | |
1928 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1526 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1929 | emask |= 0x2; |
1527 | emask |= 0x2; |
1930 | |
1528 | |
1931 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
1529 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
1932 | { |
1530 | { |
1933 | if (lastcell.faces[0] != pl->face->number) |
1531 | if (lastcell.faces[0] != pl->face) |
1934 | { |
1532 | { |
1935 | lastcell.faces[0] = pl->face->number; |
1533 | lastcell.faces[0] = pl->face; |
1936 | mask |= 0x1; |
1534 | mask |= 0x1; |
1937 | |
1535 | |
1938 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
1536 | socket.send_faces (pl); |
1939 | esrv_send_face (&socket, pl->face->number, 0); |
|
|
1940 | |
1537 | |
1941 | sl << uint16 (pl->face->number); |
1538 | sl << uint16 (pl->face); |
1942 | } |
1539 | } |
1943 | } |
1540 | } |
1944 | else |
1541 | else |
1945 | { |
1542 | { |
1946 | /* Top face */ |
1543 | /* Top face */ |
… | |
… | |
1976 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1573 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1977 | { |
1574 | { |
1978 | /* No map data will follow, so don't say the client |
1575 | /* No map data will follow, so don't say the client |
1979 | * it doesn't need draw! |
1576 | * it doesn't need draw! |
1980 | */ |
1577 | */ |
1981 | ewhatflag &= (~EMI_NOREDRAW); |
1578 | ewhatflag &= ~EMI_NOREDRAW; |
1982 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1579 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1983 | } |
1580 | } |
1984 | |
1581 | |
1985 | if (esl.length () > estartlen) |
1582 | if (esl.length () > estartlen) |
1986 | socket.send_packet (esl); |
1583 | socket.send_packet (esl); |
… | |
… | |
1998 | */ |
1595 | */ |
1999 | void |
1596 | void |
2000 | draw_client_map (object *pl) |
1597 | draw_client_map (object *pl) |
2001 | { |
1598 | { |
2002 | int i, j; |
1599 | int i, j; |
2003 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1600 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
2004 | New_Face *face, *floor; |
|
|
2005 | New_Face *floor2; |
|
|
2006 | int d, mflags; |
1601 | int mflags; |
2007 | struct Map newmap; |
1602 | struct Map newmap; |
2008 | maptile *m, *pm; |
1603 | maptile *m, *pm; |
2009 | |
1604 | |
2010 | if (pl->type != PLAYER) |
1605 | if (pl->type != PLAYER) |
2011 | { |
1606 | { |
… | |
… | |
2120 | * it then sends an updspell packet for each spell that has changed in this way |
1715 | * it then sends an updspell packet for each spell that has changed in this way |
2121 | */ |
1716 | */ |
2122 | void |
1717 | void |
2123 | esrv_update_spells (player *pl) |
1718 | esrv_update_spells (player *pl) |
2124 | { |
1719 | { |
|
|
1720 | if (!pl->ns) |
|
|
1721 | return; |
|
|
1722 | |
2125 | if (!pl->ns->monitor_spells) |
1723 | if (!pl->ns->monitor_spells) |
2126 | return; |
1724 | return; |
2127 | |
1725 | |
2128 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1726 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2129 | { |
1727 | { |
… | |
… | |
2189 | |
1787 | |
2190 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1788 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2191 | static void |
1789 | static void |
2192 | append_spell (player *pl, packet &sl, object *spell) |
1790 | append_spell (player *pl, packet &sl, object *spell) |
2193 | { |
1791 | { |
2194 | int len, i, skill = 0; |
1792 | int i, skill = 0; |
2195 | |
1793 | |
2196 | if (!(spell->name)) |
1794 | if (!(spell->name)) |
2197 | { |
1795 | { |
2198 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1796 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2199 | return; |
1797 | return; |
… | |
… | |
2211 | if (!strcmp (spell->skill, skill_names[i])) |
1809 | if (!strcmp (spell->skill, skill_names[i])) |
2212 | { |
1810 | { |
2213 | skill = i + CS_STAT_SKILLINFO; |
1811 | skill = i + CS_STAT_SKILLINFO; |
2214 | break; |
1812 | break; |
2215 | } |
1813 | } |
|
|
1814 | } |
|
|
1815 | |
|
|
1816 | // spells better have a face |
|
|
1817 | if (!spell->face) |
|
|
1818 | { |
|
|
1819 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1820 | spell->face = face_find ("burnout.x11", blank_face); |
2216 | } |
1821 | } |
2217 | |
1822 | |
2218 | /* send the current values */ |
1823 | /* send the current values */ |
2219 | sl << uint32 (spell->count) |
1824 | sl << uint32 (spell->count) |
2220 | << uint16 (spell->level) |
1825 | << uint16 (spell->level) |
… | |
… | |
2222 | << uint16 (spell->last_sp) |
1827 | << uint16 (spell->last_sp) |
2223 | << uint16 (spell->last_grace) |
1828 | << uint16 (spell->last_grace) |
2224 | << uint16 (spell->last_eat) |
1829 | << uint16 (spell->last_eat) |
2225 | << uint8 (skill) |
1830 | << uint8 (skill) |
2226 | << uint32 (spell->path_attuned) |
1831 | << uint32 (spell->path_attuned) |
2227 | << uint32 (spell->face ? spell->face->number : 0) |
1832 | << uint32 (spell->face) |
2228 | << data8 (spell->name) |
1833 | << data8 (spell->name) |
2229 | << data16 (spell->msg); |
1834 | << data16 (spell->msg); |
2230 | } |
1835 | } |
2231 | |
1836 | |
2232 | /** |
1837 | /** |
… | |
… | |
2247 | |
1852 | |
2248 | packet sl ("addspell"); |
1853 | packet sl ("addspell"); |
2249 | |
1854 | |
2250 | if (!spell) |
1855 | if (!spell) |
2251 | { |
1856 | { |
2252 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1857 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2253 | { |
1858 | { |
2254 | /* were we to simply keep appending data here, we could exceed |
1859 | /* were we to simply keep appending data here, we could exceed |
2255 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1860 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2256 | * append_spells will always append 19 data bytes, plus 4 length |
1861 | * append_spells will always append 19 data bytes, plus 4 length |
2257 | * bytes and 3 strings (because that is the spec) so we need to |
1862 | * bytes and 3 strings (because that is the spec) so we need to |