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 | |
… | |
… | |
146 | pl->ns->send_packet ("newmap"); |
144 | pl->ns->send_packet ("newmap"); |
147 | |
145 | |
148 | pl->ns->floorbox_reset (); |
146 | pl->ns->floorbox_reset (); |
149 | } |
147 | } |
150 | |
148 | |
151 | /** check for map change and send new map data */ |
149 | /** check for map/region change and send new map data */ |
152 | static void |
150 | static void |
153 | check_map_change (player *pl) |
151 | check_map_change (player *pl) |
154 | { |
152 | { |
155 | client &socket = *pl->ns; |
153 | client &socket = *pl->ns; |
156 | object *ob = pl->ob; |
154 | object *ob = pl->ob; |
… | |
… | |
176 | flags |= 4; |
174 | flags |= 4; |
177 | if (ob->map->tile_path[3]) |
175 | if (ob->map->tile_path[3]) |
178 | flags |= 8; |
176 | flags |= 8; |
179 | |
177 | |
180 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
178 | 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); |
179 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
182 | } |
180 | } |
183 | else |
181 | else |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
182 | snprintf (buf, MAX_BUF, "mapinfo current"); |
185 | |
183 | |
186 | socket.send_packet (buf); |
184 | socket.send_packet (buf); |
… | |
… | |
200 | } |
198 | } |
201 | } |
199 | } |
202 | |
200 | |
203 | socket.current_x = ob->x; |
201 | socket.current_x = ob->x; |
204 | socket.current_y = ob->y; |
202 | socket.current_y = ob->y; |
|
|
203 | |
|
|
204 | region *reg = ob->region (); |
|
|
205 | if (socket.current_region != reg) |
|
|
206 | { |
|
|
207 | socket.current_region = reg; |
|
|
208 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
209 | } |
205 | } |
210 | } |
206 | |
211 | |
207 | /** |
212 | /** |
208 | * RequestInfo is sort of a meta command. There is some specific |
213 | * RequestInfo is sort of a meta command. There is some specific |
209 | * request of information, but we call other functions to provide |
214 | * request of information, but we call other functions to provide |
… | |
… | |
290 | { |
295 | { |
291 | int dir = *buf++; |
296 | int dir = *buf++; |
292 | |
297 | |
293 | switch (dir) |
298 | switch (dir) |
294 | { |
299 | { |
295 | case '1': |
300 | case '1': |
296 | dx = 0; |
301 | dx = 0; |
297 | dy = -1; |
302 | dy = -1; |
298 | map = get_map_from_coord (map, &dx, &dy); |
303 | map = map->xy_find (dx, dy); |
299 | map && (mapy -= map->height); |
304 | map && (mapy -= map->height); |
300 | break; |
305 | break; |
301 | case '2': |
306 | case '2': |
302 | mapx += map->width; |
307 | mapx += map->width; |
303 | dx = map->width; |
308 | dx = map->width; |
304 | dy = 0; |
309 | dy = 0; |
305 | map = get_map_from_coord (map, &dx, &dy); |
310 | map = map->xy_find (dx, dy); |
306 | break; |
311 | break; |
307 | case '3': |
312 | case '3': |
308 | mapy += map->height; |
313 | mapy += map->height; |
309 | dx = 0; |
314 | dx = 0; |
310 | dy = map->height; |
315 | dy = map->height; |
311 | map = get_map_from_coord (map, &dx, &dy); |
316 | map = map->xy_find (dx, dy); |
312 | break; |
317 | break; |
313 | case '4': |
318 | case '4': |
314 | dx = -1; |
319 | dx = -1; |
315 | dy = 0; |
320 | dy = 0; |
316 | map = get_map_from_coord (map, &dx, &dy); |
321 | map = map->xy_find (dx, dy); |
317 | map && (mapx -= map->width); |
322 | map && (mapx -= map->width); |
318 | break; |
323 | break; |
319 | } |
324 | } |
320 | |
325 | |
321 | --max_distance; |
326 | --max_distance; |
322 | } |
327 | } |
323 | |
328 | |
… | |
… | |
334 | if (map->tile_path[2]) |
339 | if (map->tile_path[2]) |
335 | flags |= 4; |
340 | flags |= 4; |
336 | if (map->tile_path[3]) |
341 | if (map->tile_path[3]) |
337 | flags |= 8; |
342 | flags |= 8; |
338 | |
343 | |
339 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
344 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
340 | } |
345 | } |
341 | else |
346 | else |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
347 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | } |
348 | } |
344 | else |
349 | else |
… | |
… | |
399 | { |
404 | { |
400 | ns->sound = atoi (param); |
405 | ns->sound = atoi (param); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
402 | } |
407 | } |
403 | else if (!strcmp (cmd, "exp64")) |
408 | else if (!strcmp (cmd, "exp64")) |
404 | { |
|
|
405 | ns->exp64 = atoi (param); |
|
|
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
407 | } |
|
|
408 | else if (!strcmp (cmd, "spellmon")) |
410 | else if (!strcmp (cmd, "spellmon")) |
409 | { |
411 | { |
410 | ns->monitor_spells = atoi (param); |
412 | ns->monitor_spells = atoi (param); |
411 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
413 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
412 | } |
414 | } |
… | |
… | |
569 | * it either has to be here or init_sockets needs to be exported. |
571 | * it either has to be here or init_sockets needs to be exported. |
570 | */ |
572 | */ |
571 | void |
573 | void |
572 | AddMeCmd (char *buf, int len, client * ns) |
574 | AddMeCmd (char *buf, int len, client * ns) |
573 | { |
575 | { |
574 | if (INVOKE_CLIENT (ADDME, ns)) |
576 | 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 | } |
577 | } |
582 | |
578 | |
583 | /** Reply to ExtendedInfos command */ |
579 | /** Reply to ExtendedInfos command */ |
584 | void |
580 | void |
585 | ToggleExtendedInfos (char *buf, int len, client * ns) |
581 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
709 | uint16 smoothface; |
705 | uint16 smoothface; |
710 | |
706 | |
711 | /* If we can't find a face, return and set it so we won't try to send this |
707 | /* If we can't find a face, return and set it so we won't try to send this |
712 | * again. |
708 | * again. |
713 | */ |
709 | */ |
714 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
710 | if (!FindSmooth (face, &smoothface)) |
715 | { |
711 | { |
716 | |
712 | |
717 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
713 | LOG (llevError, "could not findsmooth for %d.\n", face); |
718 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
714 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
719 | return; |
715 | return; |
720 | } |
716 | } |
721 | |
717 | |
722 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
718 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
… | |
… | |
730 | << uint16 (smoothface); |
726 | << uint16 (smoothface); |
731 | |
727 | |
732 | ns->send_packet (sl); |
728 | ns->send_packet (sl); |
733 | } |
729 | } |
734 | |
730 | |
735 | /** |
731 | /** |
736 | * Tells client the picture it has to use |
732 | * Tells client the picture it has to use |
737 | * to smooth a picture number given as argument. |
733 | * to smooth a picture number given as argument. |
738 | */ |
734 | */ |
739 | void |
735 | void |
740 | AskSmooth (char *buf, int len, client *ns) |
736 | AskSmooth (char *buf, int len, client *ns) |
741 | { |
737 | { |
742 | SendSmooth (ns, atoi (buf)); |
738 | SendSmooth (ns, atoi (buf)); |
743 | } |
739 | } |
… | |
… | |
806 | * commands. |
802 | * commands. |
807 | */ |
803 | */ |
808 | pl->count = 0; |
804 | pl->count = 0; |
809 | |
805 | |
810 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
806 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
811 | int time = FABS (pl->ob->speed) < 0.001 |
807 | int time = fabs (pl->ob->speed) < 0.001 |
812 | ? time = MAX_TIME * 100 |
808 | ? time = MAX_TIME * 100 |
813 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
809 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
814 | |
810 | |
815 | /* Send confirmation of command execution now */ |
811 | /* Send confirmation of command execution now */ |
816 | packet sl ("comc"); |
812 | packet sl ("comc"); |
817 | sl << uint16 (cmdid) << uint32 (time); |
813 | sl << uint16 (cmdid) << uint32 (time); |
818 | pl->ns->send_packet (sl); |
814 | pl->ns->send_packet (sl); |
… | |
… | |
850 | { |
846 | { |
851 | case ST_PLAYING: |
847 | case ST_PLAYING: |
852 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
848 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
853 | break; |
849 | break; |
854 | |
850 | |
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: |
851 | case ST_CHANGE_CLASS: |
867 | key_change_class (pl->ob, buf[0]); |
852 | 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; |
853 | break; |
887 | |
854 | |
888 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
855 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
889 | receive_party_password (pl->ob, 13); |
856 | receive_party_password (pl->ob, 13); |
890 | break; |
857 | break; |
… | |
… | |
948 | { |
915 | { |
949 | ns->sound = atoi (buf); |
916 | ns->sound = atoi (buf); |
950 | } |
917 | } |
951 | |
918 | |
952 | /** client wants the map resent */ |
919 | /** client wants the map resent */ |
953 | |
|
|
954 | void |
920 | void |
955 | MapRedrawCmd (char *buf, int len, player *pl) |
921 | MapRedrawCmd (char *buf, int len, player *pl) |
956 | { |
922 | { |
957 | /* This function is currently disabled; just clearing the map state results in |
923 | /* 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. |
924 | * display errors. It should clear the cache and send a newmap command. |
… | |
… | |
1045 | esrv_update_stats (player *pl) |
1011 | esrv_update_stats (player *pl) |
1046 | { |
1012 | { |
1047 | char buf[MAX_BUF]; |
1013 | char buf[MAX_BUF]; |
1048 | uint16 flags; |
1014 | uint16 flags; |
1049 | |
1015 | |
|
|
1016 | client *ns = pl->ns; |
|
|
1017 | if (!ns) |
|
|
1018 | return; |
|
|
1019 | |
|
|
1020 | object *ob = pl->ob; |
|
|
1021 | if (!ob) |
|
|
1022 | return; |
|
|
1023 | |
1050 | packet sl ("stats"); |
1024 | packet sl ("stats"); |
1051 | |
1025 | |
1052 | if (pl->ob) |
|
|
1053 | { |
|
|
1054 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1026 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1055 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1027 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1056 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1028 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1057 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1029 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1058 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1030 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1059 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1031 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1060 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1032 | 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); |
1033 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1065 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1034 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
1035 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
1036 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
1037 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1066 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1038 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1067 | } |
|
|
1068 | |
1039 | |
1069 | if (pl->ns->exp64) |
|
|
1070 | for (int s = 0; s < NUM_SKILLS; s++) |
1040 | 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) |
1041 | if (object *skill = pl->last_skill_ob[s]) |
|
|
1042 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1072 | { |
1043 | { |
|
|
1044 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1045 | |
1073 | /* Always send along the level if exp changes. This is only |
1046 | /* Always send along the level if exp changes. This is only |
1074 | * 1 extra byte, but keeps processing simpler. |
1047 | * 1 extra byte, but keeps processing simpler. |
1075 | */ |
1048 | */ |
1076 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1049 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1077 | << uint8 (pl->last_skill_ob[s]->level) |
1050 | << uint8 (skill->level) |
1078 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1051 | << uint64 (skill->stats.exp); |
1079 | |
|
|
1080 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1081 | } |
1052 | } |
1082 | |
1053 | |
1083 | if (pl->ns->exp64) |
|
|
1084 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1054 | 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); |
1055 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1089 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1056 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1090 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1057 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1091 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1058 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1092 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1059 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1093 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1060 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1094 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1061 | 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); |
1062 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1063 | |
1096 | flags = 0; |
1064 | flags = 0; |
1097 | |
1065 | |
1098 | if (pl->fire_on) |
1066 | if (pl->fire_on) |
1099 | flags |= SF_FIREON; |
1067 | flags |= SF_FIREON; |
1100 | |
1068 | |
1101 | if (pl->run_on) |
1069 | if (pl->run_on) |
1102 | flags |= SF_RUNON; |
1070 | flags |= SF_RUNON; |
1103 | |
1071 | |
1104 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1072 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1105 | |
1073 | |
1106 | if (pl->ns->sc_version < 1025) |
1074 | if (ns->sc_version < 1025) |
1107 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1075 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1108 | else |
1076 | else |
1109 | for (int i = 0; i < NROFATTACKS; i++) |
1077 | for (int i = 0; i < NROFATTACKS; i++) |
1110 | { |
1078 | { |
1111 | /* Skip ones we won't send */ |
1079 | /* Skip ones we won't send */ |
1112 | if (atnr_cs_stat[i] == -1) |
1080 | if (atnr_cs_stat[i] == -1) |
1113 | continue; |
1081 | continue; |
1114 | |
1082 | |
1115 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1083 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1116 | } |
1084 | } |
1117 | |
1085 | |
1118 | if (pl->ns->monitor_spells) |
1086 | if (pl->ns->monitor_spells) |
1119 | { |
1087 | { |
1120 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1088 | 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); |
1089 | 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); |
1090 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1123 | } |
1091 | } |
1124 | |
1092 | |
1125 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1093 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1126 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1094 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1127 | set_title (pl->ob, buf); |
1095 | set_title (ob, buf); |
1128 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1096 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1129 | |
1097 | |
1130 | /* Only send it away if we have some actual data */ |
1098 | /* Only send it away if we have some actual data */ |
1131 | if (sl.length () > 6) |
1099 | if (sl.length () > 6) |
1132 | pl->ns->send_packet (sl); |
1100 | ns->send_packet (sl); |
1133 | } |
1101 | } |
1134 | |
1102 | |
1135 | /** |
1103 | /** |
1136 | * Tells the client that here is a player it should start using. |
1104 | * Tells the client that here is a player it should start using. |
1137 | */ |
1105 | */ |
1138 | void |
1106 | void |
1139 | esrv_new_player (player *pl, uint32 weight) |
1107 | esrv_new_player (player *pl, uint32 weight) |
1140 | { |
1108 | { |
1141 | pl->last_weight = weight; |
|
|
1142 | |
|
|
1143 | packet sl ("player"); |
1109 | packet sl ("player"); |
1144 | |
1110 | |
1145 | sl << uint32 (pl->ob->count) |
1111 | sl << uint32 (pl->ob->count) |
1146 | << uint32 (weight) |
1112 | << uint32 (weight) |
1147 | << uint32 (pl->ob->face->number) |
1113 | << uint32 (pl->ob->face) |
1148 | << data8 (pl->ob->name); |
1114 | << data8 (pl->ob->name); |
1149 | |
1115 | |
|
|
1116 | pl->ns->last_weight = weight; |
1150 | pl->ns->send_packet (sl); |
1117 | pl->ns->send_packet (sl); |
1151 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1118 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1152 | } |
1119 | } |
1153 | |
1120 | |
1154 | /** |
1121 | /** |
… | |
… | |
1196 | /****************************************************************************** |
1163 | /****************************************************************************** |
1197 | * |
1164 | * |
1198 | * Start of map related commands. |
1165 | * Start of map related commands. |
1199 | * |
1166 | * |
1200 | ******************************************************************************/ |
1167 | ******************************************************************************/ |
1201 | |
|
|
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 | |
1168 | |
1224 | /** Clears a map cell */ |
1169 | /** Clears a map cell */ |
1225 | static void |
1170 | static void |
1226 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1171 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1227 | { |
1172 | { |
… | |
… | |
1271 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1216 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1272 | { |
1217 | { |
1273 | short face_num; |
1218 | short face_num; |
1274 | |
1219 | |
1275 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1220 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1276 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1221 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face; |
1277 | else |
1222 | else |
1278 | face_num = 0; |
1223 | face_num = 0; |
1279 | |
1224 | |
1280 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1225 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1281 | { |
1226 | { |
… | |
… | |
1366 | if (!ob || ob->face == blank_face) |
1311 | if (!ob || ob->face == blank_face) |
1367 | face_num = 0; |
1312 | face_num = 0; |
1368 | else if (head) |
1313 | else if (head) |
1369 | { |
1314 | { |
1370 | /* if this is a head that had previously been stored */ |
1315 | /* if this is a head that had previously been stored */ |
1371 | face_num = ob->face->number; |
1316 | face_num = ob->face; |
1372 | } |
1317 | } |
1373 | else |
1318 | else |
1374 | { |
1319 | { |
1375 | /* if the faces for the different parts of a multipart object |
1320 | /* if the faces for the different parts of a multipart object |
1376 | * are the same, we only want to send the bottom right most |
1321 | * are the same, we only want to send the bottom right most |
… | |
… | |
1418 | /* single part object, multipart object with non merged faces, |
1363 | /* single part object, multipart object with non merged faces, |
1419 | * of multipart object already at lower right. |
1364 | * of multipart object already at lower right. |
1420 | */ |
1365 | */ |
1421 | else if (bx == sx && by == sy) |
1366 | else if (bx == sx && by == sy) |
1422 | { |
1367 | { |
1423 | face_num = ob->face->number; |
1368 | face_num = ob->face; |
1424 | |
1369 | |
1425 | /* if this face matches one stored away, clear that one away. |
1370 | /* if this face matches one stored away, clear that one away. |
1426 | * this code relies on the fact that the map1 commands |
1371 | * this code relies on the fact that the map1 commands |
1427 | * goes from 2 down to 0. |
1372 | * goes from 2 down to 0. |
1428 | */ |
1373 | */ |
1429 | for (i = 0; i < MAP_LAYERS; i++) |
1374 | for (i = 0; i < MAP_LAYERS; i++) |
1430 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
1375 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
1431 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
1376 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face == face_num) |
1432 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
1377 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
1433 | } |
1378 | } |
1434 | else |
1379 | else |
1435 | { |
1380 | { |
1436 | /* If this head is stored away, clear it - otherwise, |
1381 | /* If this head is stored away, clear it - otherwise, |
1437 | * there can be cases where a object is on multiple layers - |
1382 | * there can be cases where a object is on multiple layers - |
1438 | * we only want to send it once. |
1383 | * we only want to send it once. |
1439 | */ |
1384 | */ |
1440 | face_num = head->face->number; |
1385 | face_num = head->face; |
1441 | for (i = 0; i < MAP_LAYERS; i++) |
1386 | for (i = 0; i < MAP_LAYERS; i++) |
1442 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
1387 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
1443 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
1388 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face == face_num) |
1444 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
1389 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
1445 | |
1390 | |
1446 | /* First, try to put the new head on the same layer. If that is used up, |
1391 | /* First, try to put the new head on the same layer. If that is used up, |
1447 | * then find another layer. |
1392 | * then find another layer. |
1448 | */ |
1393 | */ |
… | |
… | |
1465 | else |
1410 | else |
1466 | { |
1411 | { |
1467 | /* In this case, we are already at the lower right or single part object, |
1412 | /* In this case, we are already at the lower right or single part object, |
1468 | * so nothing special |
1413 | * so nothing special |
1469 | */ |
1414 | */ |
1470 | face_num = ob->face->number; |
1415 | face_num = ob->face; |
1471 | |
1416 | |
1472 | /* clear out any head entries that have the same face as this one */ |
1417 | /* clear out any head entries that have the same face as this one */ |
1473 | for (bx = 0; bx < layer; bx++) |
1418 | for (bx = 0; bx < layer; bx++) |
1474 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
1419 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
1475 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
1420 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face == face_num) |
1476 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
1421 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
1477 | } |
1422 | } |
1478 | } /* else not already head object or blank face */ |
1423 | } /* else not already head object or blank face */ |
1479 | |
1424 | |
1480 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
1425 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
… | |
… | |
1484 | * of the same type, what happens then is it doesn't think it needs to send |
1429 | * 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. |
1430 | * This tends to make stacking also work/look better. |
1486 | */ |
1431 | */ |
1487 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
1432 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
1488 | { |
1433 | { |
1489 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
1434 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face; |
1490 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
1435 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
1491 | } |
1436 | } |
1492 | |
1437 | |
1493 | /* Another hack - because of heads and whatnot, this face may match one |
1438 | /* 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 |
1439 | * we already sent for a lower layer. In that case, don't send |
… | |
… | |
1542 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1487 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1543 | |
1488 | |
1544 | /* If there is no object for this space, or if the face for the object |
1489 | /* 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. |
1490 | * is the blank face, set the smoothlevel to zero. |
1546 | */ |
1491 | */ |
1547 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1492 | if (!ob || ob->face == blank_face) |
1548 | smoothlevel = 0; |
1493 | smoothlevel = 0; |
1549 | else |
1494 | else |
1550 | { |
1495 | { |
1551 | smoothlevel = ob->smoothlevel; |
1496 | smoothlevel = ob->smoothlevel; |
1552 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1497 | if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH)) |
1553 | SendSmooth (&ns, ob->face->number); |
1498 | SendSmooth (&ns, ob->face); |
1554 | } /* else not already head object or blank face */ |
1499 | } /* else not already head object or blank face */ |
1555 | |
1500 | |
1556 | /* We've gotten what face we want to use for the object. Now see if |
1501 | /* 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. |
1502 | * if it has changed since we last sent it to the client. |
1558 | */ |
1503 | */ |
… | |
… | |
1587 | if (ns->EMI_smooth) |
1532 | if (ns->EMI_smooth) |
1588 | result += 1; /*One byte for smoothlevel */ |
1533 | result += 1; /*One byte for smoothlevel */ |
1589 | } |
1534 | } |
1590 | |
1535 | |
1591 | return result; |
1536 | return result; |
|
|
1537 | } |
|
|
1538 | |
|
|
1539 | // prefetch (and touch) all maps within a specific distancd |
|
|
1540 | static void |
|
|
1541 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1542 | { |
|
|
1543 | map->last_access = runtime; |
|
|
1544 | |
|
|
1545 | if (--distance) |
|
|
1546 | for (int dir = 4; --dir; ) |
|
|
1547 | if (const shstr &path = map->tile_path [dir]) |
|
|
1548 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1549 | prefetch_surrounding_maps (neigh, distance); |
|
|
1550 | else |
|
|
1551 | neigh = maptile::find_async (path, map); |
|
|
1552 | } |
|
|
1553 | |
|
|
1554 | // prefetch a generous area around the player |
|
|
1555 | static void |
|
|
1556 | prefetch_surrounding_maps (object *op) |
|
|
1557 | { |
|
|
1558 | prefetch_surrounding_maps (op->map, 3); |
1592 | } |
1559 | } |
1593 | |
1560 | |
1594 | /** |
1561 | /** |
1595 | * This function uses the new map1 protocol command to send the map |
1562 | * 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 |
1563 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1625 | uint8 extendedinfos; |
1592 | uint8 extendedinfos; |
1626 | maptile *m; |
1593 | maptile *m; |
1627 | |
1594 | |
1628 | client &socket = *pl->contr->ns; |
1595 | client &socket = *pl->contr->ns; |
1629 | |
1596 | |
|
|
1597 | if (!pl->active) |
|
|
1598 | return; |
|
|
1599 | |
1630 | check_map_change (pl->contr); |
1600 | check_map_change (pl->contr); |
|
|
1601 | prefetch_surrounding_maps (pl); |
1631 | |
1602 | |
1632 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1603 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1633 | packet esl; |
1604 | packet esl; |
1634 | |
1605 | |
1635 | startlen = sl.length (); |
1606 | startlen = sl.length (); |
… | |
… | |
1754 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1725 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1755 | } |
1726 | } |
1756 | } |
1727 | } |
1757 | else if (d > 3) |
1728 | else if (d > 3) |
1758 | { |
1729 | { |
|
|
1730 | m->touch (); |
|
|
1731 | |
1759 | int need_send = 0, count; |
1732 | int need_send = 0, count; |
1760 | |
1733 | |
1761 | /* This block deals with spaces that are not visible for whatever |
1734 | /* This block deals with spaces that are not visible for whatever |
1762 | * reason. Still may need to send the head for this space. |
1735 | * reason. Still may need to send the head for this space. |
1763 | */ |
1736 | */ |
… | |
… | |
1796 | else |
1769 | else |
1797 | sl.reset (oldlen); |
1770 | sl.reset (oldlen); |
1798 | } |
1771 | } |
1799 | else |
1772 | else |
1800 | { |
1773 | { |
|
|
1774 | m->touch (); |
|
|
1775 | |
1801 | /* In this block, the space is visible or there are head objects |
1776 | /* In this block, the space is visible or there are head objects |
1802 | * we need to send. |
1777 | * we need to send. |
1803 | */ |
1778 | */ |
1804 | |
1779 | |
1805 | /* Rather than try to figure out what everything that we might |
1780 | /* Rather than try to figure out what everything that we might |
… | |
… | |
1928 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1903 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1929 | emask |= 0x2; |
1904 | emask |= 0x2; |
1930 | |
1905 | |
1931 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
1906 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
1932 | { |
1907 | { |
1933 | if (lastcell.faces[0] != pl->face->number) |
1908 | if (lastcell.faces[0] != pl->face) |
1934 | { |
1909 | { |
1935 | lastcell.faces[0] = pl->face->number; |
1910 | lastcell.faces[0] = pl->face; |
1936 | mask |= 0x1; |
1911 | mask |= 0x1; |
1937 | |
1912 | |
1938 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
1913 | if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE)) |
1939 | esrv_send_face (&socket, pl->face->number, 0); |
1914 | esrv_send_face (&socket, pl->face, 0); |
1940 | |
1915 | |
1941 | sl << uint16 (pl->face->number); |
1916 | sl << uint16 (pl->face); |
1942 | } |
1917 | } |
1943 | } |
1918 | } |
1944 | else |
1919 | else |
1945 | { |
1920 | { |
1946 | /* Top face */ |
1921 | /* Top face */ |
… | |
… | |
1998 | */ |
1973 | */ |
1999 | void |
1974 | void |
2000 | draw_client_map (object *pl) |
1975 | draw_client_map (object *pl) |
2001 | { |
1976 | { |
2002 | int i, j; |
1977 | int i, j; |
2003 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1978 | 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; |
1979 | int mflags; |
2007 | struct Map newmap; |
1980 | struct Map newmap; |
2008 | maptile *m, *pm; |
1981 | maptile *m, *pm; |
2009 | |
1982 | |
2010 | if (pl->type != PLAYER) |
1983 | if (pl->type != PLAYER) |
2011 | { |
1984 | { |
… | |
… | |
2120 | * it then sends an updspell packet for each spell that has changed in this way |
2093 | * it then sends an updspell packet for each spell that has changed in this way |
2121 | */ |
2094 | */ |
2122 | void |
2095 | void |
2123 | esrv_update_spells (player *pl) |
2096 | esrv_update_spells (player *pl) |
2124 | { |
2097 | { |
|
|
2098 | if (!pl->ns) |
|
|
2099 | return; |
|
|
2100 | |
2125 | if (!pl->ns->monitor_spells) |
2101 | if (!pl->ns->monitor_spells) |
2126 | return; |
2102 | return; |
2127 | |
2103 | |
2128 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2104 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2129 | { |
2105 | { |
… | |
… | |
2189 | |
2165 | |
2190 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2166 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2191 | static void |
2167 | static void |
2192 | append_spell (player *pl, packet &sl, object *spell) |
2168 | append_spell (player *pl, packet &sl, object *spell) |
2193 | { |
2169 | { |
2194 | int len, i, skill = 0; |
2170 | int i, skill = 0; |
2195 | |
2171 | |
2196 | if (!(spell->name)) |
2172 | if (!(spell->name)) |
2197 | { |
2173 | { |
2198 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2174 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2199 | return; |
2175 | return; |
… | |
… | |
2211 | if (!strcmp (spell->skill, skill_names[i])) |
2187 | if (!strcmp (spell->skill, skill_names[i])) |
2212 | { |
2188 | { |
2213 | skill = i + CS_STAT_SKILLINFO; |
2189 | skill = i + CS_STAT_SKILLINFO; |
2214 | break; |
2190 | break; |
2215 | } |
2191 | } |
|
|
2192 | } |
|
|
2193 | |
|
|
2194 | // spells better have a face |
|
|
2195 | if (!spell->face) |
|
|
2196 | { |
|
|
2197 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
2198 | spell->face = face_find ("burnout.x11", blank_face); |
2216 | } |
2199 | } |
2217 | |
2200 | |
2218 | /* send the current values */ |
2201 | /* send the current values */ |
2219 | sl << uint32 (spell->count) |
2202 | sl << uint32 (spell->count) |
2220 | << uint16 (spell->level) |
2203 | << uint16 (spell->level) |
… | |
… | |
2222 | << uint16 (spell->last_sp) |
2205 | << uint16 (spell->last_sp) |
2223 | << uint16 (spell->last_grace) |
2206 | << uint16 (spell->last_grace) |
2224 | << uint16 (spell->last_eat) |
2207 | << uint16 (spell->last_eat) |
2225 | << uint8 (skill) |
2208 | << uint8 (skill) |
2226 | << uint32 (spell->path_attuned) |
2209 | << uint32 (spell->path_attuned) |
2227 | << uint32 (spell->face ? spell->face->number : 0) |
2210 | << uint32 (spell->face) |
2228 | << data8 (spell->name) |
2211 | << data8 (spell->name) |
2229 | << data16 (spell->msg); |
2212 | << data16 (spell->msg); |
2230 | } |
2213 | } |
2231 | |
2214 | |
2232 | /** |
2215 | /** |
… | |
… | |
2247 | |
2230 | |
2248 | packet sl ("addspell"); |
2231 | packet sl ("addspell"); |
2249 | |
2232 | |
2250 | if (!spell) |
2233 | if (!spell) |
2251 | { |
2234 | { |
2252 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2235 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2253 | { |
2236 | { |
2254 | /* were we to simply keep appending data here, we could exceed |
2237 | /* were we to simply keep appending data here, we could exceed |
2255 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2238 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2256 | * append_spells will always append 19 data bytes, plus 4 length |
2239 | * 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 |
2240 | * bytes and 3 strings (because that is the spec) so we need to |