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 | * |
… | |
… | |
138 | } |
139 | } |
139 | |
140 | |
140 | static void |
141 | static void |
141 | clear_map (player *pl) |
142 | clear_map (player *pl) |
142 | { |
143 | { |
143 | memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); |
144 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
144 | |
145 | |
145 | if (pl->socket->newmapcmd == 1) |
146 | if (pl->ns->newmapcmd == 1) |
146 | pl->socket->send_packet ("newmap"); |
147 | pl->ns->send_packet ("newmap"); |
147 | |
148 | |
148 | pl->socket->floorbox_reset (); |
149 | pl->ns->floorbox_reset (); |
149 | } |
150 | } |
150 | |
151 | |
151 | /** check for map change and send new map data */ |
152 | /** check for map change and send new map data */ |
152 | static void |
153 | static void |
153 | check_map_change (player *pl) |
154 | check_map_change (player *pl) |
154 | { |
155 | { |
155 | client &socket = *pl->socket; |
156 | client &socket = *pl->ns; |
156 | object *ob = pl->ob; |
157 | object *ob = pl->ob; |
157 | char buf[MAX_BUF]; /* eauugggh */ |
158 | char buf[MAX_BUF]; /* eauugggh */ |
158 | |
159 | |
159 | if (socket.current_map != ob->map) |
160 | if (socket.current_map != ob->map) |
160 | { |
161 | { |
… | |
… | |
176 | flags |= 4; |
177 | flags |= 4; |
177 | if (ob->map->tile_path[3]) |
178 | if (ob->map->tile_path[3]) |
178 | flags |= 8; |
179 | flags |= 8; |
179 | |
180 | |
180 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
181 | 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); |
182 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
182 | } |
183 | } |
183 | else |
184 | else |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
185 | snprintf (buf, MAX_BUF, "mapinfo current"); |
185 | |
186 | |
186 | socket.send_packet (buf); |
187 | socket.send_packet (buf); |
… | |
… | |
280 | buf += 8; |
281 | buf += 8; |
281 | |
282 | |
282 | // initial map and its origin |
283 | // initial map and its origin |
283 | maptile *map = pl->ob->map; |
284 | maptile *map = pl->ob->map; |
284 | sint16 dx, dy; |
285 | sint16 dx, dy; |
285 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
286 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
286 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
287 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
287 | int max_distance = 8; // limit maximum path length to something generous |
288 | int max_distance = 8; // limit maximum path length to something generous |
288 | |
289 | |
289 | while (*buf && map && max_distance) |
290 | while (*buf && map && max_distance) |
290 | { |
291 | { |
291 | int dir = *buf++; |
292 | int dir = *buf++; |
292 | |
293 | |
293 | switch (dir) |
294 | switch (dir) |
294 | { |
295 | { |
295 | case '1': |
296 | case '1': |
296 | dx = 0; |
297 | dx = 0; |
297 | dy = -1; |
298 | dy = -1; |
298 | map = get_map_from_coord (map, &dx, &dy); |
299 | map = map->xy_find (dx, dy); |
299 | map && (mapy -= map->height); |
300 | map && (mapy -= map->height); |
300 | break; |
301 | break; |
301 | case '2': |
302 | case '2': |
302 | mapx += map->width; |
303 | mapx += map->width; |
303 | dx = map->width; |
304 | dx = map->width; |
304 | dy = 0; |
305 | dy = 0; |
305 | map = get_map_from_coord (map, &dx, &dy); |
306 | map = map->xy_find (dx, dy); |
306 | break; |
307 | break; |
307 | case '3': |
308 | case '3': |
308 | mapy += map->height; |
309 | mapy += map->height; |
309 | dx = 0; |
310 | dx = 0; |
310 | dy = map->height; |
311 | dy = map->height; |
311 | map = get_map_from_coord (map, &dx, &dy); |
312 | map = map->xy_find (dx, dy); |
312 | break; |
313 | break; |
313 | case '4': |
314 | case '4': |
314 | dx = -1; |
315 | dx = -1; |
315 | dy = 0; |
316 | dy = 0; |
316 | map = get_map_from_coord (map, &dx, &dy); |
317 | map = map->xy_find (dx, dy); |
317 | map && (mapx -= map->width); |
318 | map && (mapx -= map->width); |
318 | break; |
319 | break; |
319 | } |
320 | } |
320 | |
321 | |
321 | --max_distance; |
322 | --max_distance; |
322 | } |
323 | } |
323 | |
324 | |
… | |
… | |
334 | if (map->tile_path[2]) |
335 | if (map->tile_path[2]) |
335 | flags |= 4; |
336 | flags |= 4; |
336 | if (map->tile_path[3]) |
337 | if (map->tile_path[3]) |
337 | flags |= 8; |
338 | flags |= 8; |
338 | |
339 | |
339 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
340 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
340 | } |
341 | } |
341 | else |
342 | else |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | } |
344 | } |
344 | else |
345 | else |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | |
347 | |
347 | pl->socket->send_packet (bigbuf); |
348 | pl->ns->send_packet (bigbuf); |
348 | } |
349 | } |
349 | |
350 | |
350 | /** This is the Setup cmd - easy first implementation */ |
351 | /** This is the Setup cmd - easy first implementation */ |
351 | void |
352 | void |
352 | SetUp (char *buf, int len, client * ns) |
353 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
399 | { |
400 | { |
400 | ns->sound = atoi (param); |
401 | ns->sound = atoi (param); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
402 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
402 | } |
403 | } |
403 | else if (!strcmp (cmd, "exp64")) |
404 | else if (!strcmp (cmd, "exp64")) |
404 | { |
|
|
405 | ns->exp64 = atoi (param); |
|
|
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
405 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
407 | } |
|
|
408 | else if (!strcmp (cmd, "spellmon")) |
406 | else if (!strcmp (cmd, "spellmon")) |
409 | { |
407 | { |
410 | ns->monitor_spells = atoi (param); |
408 | ns->monitor_spells = atoi (param); |
411 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
412 | } |
410 | } |
… | |
… | |
569 | * it either has to be here or init_sockets needs to be exported. |
567 | * it either has to be here or init_sockets needs to be exported. |
570 | */ |
568 | */ |
571 | void |
569 | void |
572 | AddMeCmd (char *buf, int len, client * ns) |
570 | AddMeCmd (char *buf, int len, client * ns) |
573 | { |
571 | { |
574 | if (ns->status != Ns_Add || add_player (ns)) |
572 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
575 | ns->send_packet ("addme_failed"); |
|
|
576 | else |
|
|
577 | ns->send_packet ("addme_success"); |
|
|
578 | } |
573 | } |
579 | |
574 | |
580 | /** Reply to ExtendedInfos command */ |
575 | /** Reply to ExtendedInfos command */ |
581 | void |
576 | void |
582 | ToggleExtendedInfos (char *buf, int len, client * ns) |
577 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
719 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
714 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
720 | esrv_send_face (ns, smoothface, 0); |
715 | esrv_send_face (ns, smoothface, 0); |
721 | |
716 | |
722 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
717 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
723 | |
718 | |
724 | packet sl; |
719 | packet sl ("smooth"); |
725 | |
720 | |
726 | sl << "smooth " |
|
|
727 | << uint16 (face) |
721 | sl << uint16 (face) |
728 | << uint16 (smoothface); |
722 | << uint16 (smoothface); |
729 | |
723 | |
730 | ns->send_packet (sl); |
724 | ns->send_packet (sl); |
731 | } |
725 | } |
732 | |
726 | |
… | |
… | |
804 | * commands. |
798 | * commands. |
805 | */ |
799 | */ |
806 | pl->count = 0; |
800 | pl->count = 0; |
807 | |
801 | |
808 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
802 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
809 | int time = FABS (pl->ob->speed) < 0.001 |
803 | int time = fabs (pl->ob->speed) < 0.001 |
810 | ? time = MAX_TIME * 100 |
804 | ? time = MAX_TIME * 100 |
811 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
805 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
812 | |
806 | |
813 | /* Send confirmation of command execution now */ |
807 | /* Send confirmation of command execution now */ |
814 | packet sl; |
808 | packet sl ("comc"); |
815 | sl << "comc " << uint16 (cmdid) << uint32 (time); |
809 | sl << uint16 (cmdid) << uint32 (time); |
816 | pl->socket->send_packet (sl); |
810 | pl->ns->send_packet (sl); |
817 | } |
811 | } |
818 | |
|
|
819 | |
812 | |
820 | /** This is a reply to a previous query. */ |
813 | /** This is a reply to a previous query. */ |
821 | void |
814 | void |
822 | ReplyCmd (char *buf, int len, player *pl) |
815 | ReplyCmd (char *buf, int len, client *ns) |
823 | { |
816 | { |
|
|
817 | if (ns->state == ST_CUSTOM) |
|
|
818 | { |
|
|
819 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
820 | return; |
|
|
821 | } |
|
|
822 | |
|
|
823 | if (!ns->pl) |
|
|
824 | return; //TODO: depends on the exact reply we are after |
|
|
825 | //TODO: but right now, we always have a ns->pl |
|
|
826 | |
|
|
827 | player *pl = ns->pl; |
|
|
828 | |
824 | /* This is to synthesize how the data would be stored if it |
829 | /* This is to synthesize how the data would be stored if it |
825 | * was normally entered. A bit of a hack, and should be cleaned up |
830 | * was normally entered. A bit of a hack, and should be cleaned up |
826 | * once all the X11 code is removed from the server. |
831 | * once all the X11 code is removed from the server. |
827 | * |
832 | * |
828 | * We pass 13 to many of the functions because this way they |
833 | * We pass 13 to many of the functions because this way they |
… | |
… | |
831 | */ |
836 | */ |
832 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
837 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
833 | |
838 | |
834 | /* this avoids any hacking here */ |
839 | /* this avoids any hacking here */ |
835 | |
840 | |
836 | switch (pl->state) |
841 | switch (ns->state) |
837 | { |
842 | { |
838 | case ST_PLAYING: |
843 | case ST_PLAYING: |
839 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
844 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
840 | break; |
845 | break; |
841 | |
846 | |
842 | case ST_PLAY_AGAIN: |
|
|
843 | /* We can check this for return value (2==quit). Maybe we |
|
|
844 | * should, and do something appropriate? |
|
|
845 | */ |
|
|
846 | receive_play_again (pl->ob, buf[0]); |
|
|
847 | break; |
|
|
848 | |
|
|
849 | case ST_ROLL_STAT: |
|
|
850 | key_roll_stat (pl->ob, buf[0]); |
|
|
851 | break; |
|
|
852 | |
|
|
853 | case ST_CHANGE_CLASS: |
847 | case ST_CHANGE_CLASS: |
854 | |
|
|
855 | key_change_class (pl->ob, buf[0]); |
848 | key_change_class (pl->ob, buf[0]); |
856 | break; |
|
|
857 | |
|
|
858 | case ST_CONFIRM_QUIT: |
|
|
859 | key_confirm_quit (pl->ob, buf[0]); |
|
|
860 | break; |
|
|
861 | |
|
|
862 | case ST_CONFIGURE: |
|
|
863 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
864 | pl->state = ST_PLAYING; |
|
|
865 | break; |
|
|
866 | |
|
|
867 | case ST_GET_NAME: |
|
|
868 | receive_player_name (pl->ob, 13); |
|
|
869 | break; |
|
|
870 | |
|
|
871 | case ST_GET_PASSWORD: |
|
|
872 | case ST_CONFIRM_PASSWORD: |
|
|
873 | receive_player_password (pl->ob, 13); |
|
|
874 | break; |
849 | break; |
875 | |
850 | |
876 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
851 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
877 | receive_party_password (pl->ob, 13); |
852 | receive_party_password (pl->ob, 13); |
878 | break; |
853 | break; |
879 | |
854 | |
880 | default: |
855 | default: |
881 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
856 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
882 | } |
857 | } |
883 | } |
858 | } |
884 | |
859 | |
885 | /** |
860 | /** |
886 | * Client tells its version. If there is a mismatch, we close the |
861 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
936 | { |
911 | { |
937 | ns->sound = atoi (buf); |
912 | ns->sound = atoi (buf); |
938 | } |
913 | } |
939 | |
914 | |
940 | /** client wants the map resent */ |
915 | /** client wants the map resent */ |
941 | |
|
|
942 | void |
916 | void |
943 | MapRedrawCmd (char *buf, int len, player *pl) |
917 | MapRedrawCmd (char *buf, int len, player *pl) |
944 | { |
918 | { |
945 | /* This function is currently disabled; just clearing the map state results in |
919 | /* This function is currently disabled; just clearing the map state results in |
946 | * display errors. It should clear the cache and send a newmap command. |
920 | * display errors. It should clear the cache and send a newmap command. |
… | |
… | |
1033 | esrv_update_stats (player *pl) |
1007 | esrv_update_stats (player *pl) |
1034 | { |
1008 | { |
1035 | char buf[MAX_BUF]; |
1009 | char buf[MAX_BUF]; |
1036 | uint16 flags; |
1010 | uint16 flags; |
1037 | |
1011 | |
1038 | packet sl; |
1012 | client *ns = pl->ns; |
1039 | sl << "stats "; |
1013 | if (!ns) |
|
|
1014 | return; |
1040 | |
1015 | |
|
|
1016 | object *ob = pl->ob; |
1041 | if (pl->ob) |
1017 | if (!ob) |
1042 | { |
1018 | return; |
|
|
1019 | |
|
|
1020 | packet sl ("stats"); |
|
|
1021 | |
1043 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1022 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1044 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1023 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1045 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1024 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1046 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1025 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1047 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1026 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1048 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1027 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1049 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1028 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1050 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1051 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1052 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1053 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1029 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1054 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1030 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
1031 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
1032 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
1033 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1055 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1034 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1056 | } |
|
|
1057 | |
1035 | |
1058 | if (pl->socket->exp64) |
|
|
1059 | for (int s = 0; s < NUM_SKILLS; s++) |
1036 | for (int s = 0; s < NUM_SKILLS; s++) |
1060 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1037 | if (object *skill = pl->last_skill_ob[s]) |
|
|
1038 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1061 | { |
1039 | { |
|
|
1040 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1041 | |
1062 | /* Always send along the level if exp changes. This is only |
1042 | /* Always send along the level if exp changes. This is only |
1063 | * 1 extra byte, but keeps processing simpler. |
1043 | * 1 extra byte, but keeps processing simpler. |
1064 | */ |
1044 | */ |
1065 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1045 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1066 | << uint8 (pl->last_skill_ob[s]->level) |
1046 | << uint8 (skill->level) |
1067 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1047 | << uint64 (skill->stats.exp); |
1068 | |
|
|
1069 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1070 | } |
1048 | } |
1071 | |
1049 | |
1072 | if (pl->socket->exp64) |
|
|
1073 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1050 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1074 | else |
|
|
1075 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1076 | |
|
|
1077 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1051 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1078 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1052 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1079 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1053 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1080 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1054 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1081 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1055 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1082 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1056 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1083 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1057 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1084 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1058 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1059 | |
1085 | flags = 0; |
1060 | flags = 0; |
1086 | |
1061 | |
1087 | if (pl->fire_on) |
1062 | if (pl->fire_on) |
1088 | flags |= SF_FIREON; |
1063 | flags |= SF_FIREON; |
1089 | |
1064 | |
1090 | if (pl->run_on) |
1065 | if (pl->run_on) |
1091 | flags |= SF_RUNON; |
1066 | flags |= SF_RUNON; |
1092 | |
1067 | |
1093 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1068 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1094 | |
1069 | |
1095 | if (pl->socket->sc_version < 1025) |
1070 | if (ns->sc_version < 1025) |
1096 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1071 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1097 | else |
1072 | else |
1098 | for (int i = 0; i < NROFATTACKS; i++) |
1073 | for (int i = 0; i < NROFATTACKS; i++) |
1099 | { |
1074 | { |
1100 | /* Skip ones we won't send */ |
1075 | /* Skip ones we won't send */ |
1101 | if (atnr_cs_stat[i] == -1) |
1076 | if (atnr_cs_stat[i] == -1) |
1102 | continue; |
1077 | continue; |
1103 | |
1078 | |
1104 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1079 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1105 | } |
1080 | } |
1106 | |
1081 | |
1107 | if (pl->socket->monitor_spells) |
1082 | if (pl->ns->monitor_spells) |
1108 | { |
1083 | { |
1109 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1084 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1110 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1085 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1111 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1086 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1112 | } |
1087 | } |
1113 | |
1088 | |
1114 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1089 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1115 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1090 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1116 | set_title (pl->ob, buf); |
1091 | set_title (ob, buf); |
1117 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1092 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1118 | |
1093 | |
1119 | /* Only send it away if we have some actual data */ |
1094 | /* Only send it away if we have some actual data */ |
1120 | if (sl.length () > 6) |
1095 | if (sl.length () > 6) |
1121 | pl->socket->send_packet (sl); |
1096 | ns->send_packet (sl); |
1122 | } |
1097 | } |
1123 | |
1098 | |
1124 | /** |
1099 | /** |
1125 | * Tells the client that here is a player it should start using. |
1100 | * Tells the client that here is a player it should start using. |
1126 | */ |
1101 | */ |
1127 | void |
1102 | void |
1128 | esrv_new_player (player *pl, uint32 weight) |
1103 | esrv_new_player (player *pl, uint32 weight) |
1129 | { |
1104 | { |
1130 | pl->last_weight = weight; |
1105 | packet sl ("player"); |
1131 | |
|
|
1132 | packet sl; |
|
|
1133 | sl << "player "; |
|
|
1134 | |
1106 | |
1135 | sl << uint32 (pl->ob->count) |
1107 | sl << uint32 (pl->ob->count) |
1136 | << uint32 (weight) |
1108 | << uint32 (weight) |
1137 | << uint32 (pl->ob->face->number) |
1109 | << uint32 (pl->ob->face->number) |
1138 | << data8 (pl->ob->name); |
1110 | << data8 (pl->ob->name); |
1139 | |
1111 | |
|
|
1112 | pl->ns->last_weight = weight; |
1140 | pl->socket->send_packet (sl); |
1113 | pl->ns->send_packet (sl); |
1141 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1114 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1142 | } |
1115 | } |
1143 | |
1116 | |
1144 | /** |
1117 | /** |
1145 | * Need to send an animation sequence to the client. |
1118 | * Need to send an animation sequence to the client. |
… | |
… | |
1159 | { |
1132 | { |
1160 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1133 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1161 | return; |
1134 | return; |
1162 | } |
1135 | } |
1163 | |
1136 | |
1164 | packet sl; |
1137 | packet sl ("anim"); |
1165 | |
1138 | |
1166 | sl << "anim " |
|
|
1167 | << uint16 (anim_num) |
1139 | sl << uint16 (anim_num) |
1168 | << uint16 (0); /* flags - not used right now */ |
1140 | << uint16 (0); /* flags - not used right now */ |
1169 | |
1141 | |
1170 | /* Build up the list of faces. Also, send any information (ie, the |
1142 | /* Build up the list of faces. Also, send any information (ie, the |
1171 | * the face itself) down to the client. |
1143 | * the face itself) down to the client. |
1172 | */ |
1144 | */ |
… | |
… | |
1533 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1534 | |
1506 | |
1535 | /* If there is no object for this space, or if the face for the object |
1507 | /* If there is no object for this space, or if the face for the object |
1536 | * is the blank face, set the smoothlevel to zero. |
1508 | * is the blank face, set the smoothlevel to zero. |
1537 | */ |
1509 | */ |
1538 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1510 | if (!ob || ob->face == blank_face) |
1539 | smoothlevel = 0; |
1511 | smoothlevel = 0; |
1540 | else |
1512 | else |
1541 | { |
1513 | { |
1542 | smoothlevel = ob->smoothlevel; |
1514 | smoothlevel = ob->smoothlevel; |
1543 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1578 | if (ns->EMI_smooth) |
1550 | if (ns->EMI_smooth) |
1579 | result += 1; /*One byte for smoothlevel */ |
1551 | result += 1; /*One byte for smoothlevel */ |
1580 | } |
1552 | } |
1581 | |
1553 | |
1582 | return result; |
1554 | return result; |
|
|
1555 | } |
|
|
1556 | |
|
|
1557 | // prefetch (and touch) all maps within a specific distancd |
|
|
1558 | static void |
|
|
1559 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1560 | { |
|
|
1561 | map->last_access = runtime; |
|
|
1562 | |
|
|
1563 | if (--distance) |
|
|
1564 | for (int dir = 4; --dir; ) |
|
|
1565 | if (const shstr &path = map->tile_path [dir]) |
|
|
1566 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1567 | prefetch_surrounding_maps (neigh, distance); |
|
|
1568 | else |
|
|
1569 | neigh = maptile::find_async (path, map); |
|
|
1570 | } |
|
|
1571 | |
|
|
1572 | // prefetch a generous area around the player |
|
|
1573 | static void |
|
|
1574 | prefetch_surrounding_maps (object *op) |
|
|
1575 | { |
|
|
1576 | prefetch_surrounding_maps (op->map, 3); |
1583 | } |
1577 | } |
1584 | |
1578 | |
1585 | /** |
1579 | /** |
1586 | * This function uses the new map1 protocol command to send the map |
1580 | * This function uses the new map1 protocol command to send the map |
1587 | * to the client. It is necessary because the old map command supports |
1581 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1593 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1587 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1594 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1588 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1595 | * and use the other 4 bits for other informatiion. For full documentation |
1589 | * and use the other 4 bits for other informatiion. For full documentation |
1596 | * of what we send, see the doc/Protocol file. |
1590 | * of what we send, see the doc/Protocol file. |
1597 | * I will describe internally what we do: |
1591 | * I will describe internally what we do: |
1598 | * the socket->lastmap shows how the map last looked when sent to the client. |
1592 | * the ns->lastmap shows how the map last looked when sent to the client. |
1599 | * in the lastmap structure, there is a cells array, which is set to the |
1593 | * in the lastmap structure, there is a cells array, which is set to the |
1600 | * maximum viewable size (As set in config.h). |
1594 | * maximum viewable size (As set in config.h). |
1601 | * in the cells, there are faces and a count value. |
1595 | * in the cells, there are faces and a count value. |
1602 | * we use the count value to hold the darkness value. If -1, then this space |
1596 | * we use the count value to hold the darkness value. If -1, then this space |
1603 | * is not viewable. |
1597 | * is not viewable. |
… | |
… | |
1614 | uint8 eentrysize; |
1608 | uint8 eentrysize; |
1615 | uint16 ewhatstart, ewhatflag; |
1609 | uint16 ewhatstart, ewhatflag; |
1616 | uint8 extendedinfos; |
1610 | uint8 extendedinfos; |
1617 | maptile *m; |
1611 | maptile *m; |
1618 | |
1612 | |
1619 | client &socket = *pl->contr->socket; |
1613 | client &socket = *pl->contr->ns; |
|
|
1614 | |
|
|
1615 | if (!pl->active) |
|
|
1616 | return; |
1620 | |
1617 | |
1621 | check_map_change (pl->contr); |
1618 | check_map_change (pl->contr); |
|
|
1619 | prefetch_surrounding_maps (pl); |
1622 | |
1620 | |
1623 | packet sl; |
1621 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1624 | packet esl; |
1622 | packet esl; |
1625 | |
1623 | |
1626 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1627 | startlen = sl.length (); |
1624 | startlen = sl.length (); |
1628 | |
1625 | |
1629 | /*Extendedmapinfo structure initialisation */ |
1626 | /*Extendedmapinfo structure initialisation */ |
1630 | if (socket.ext_mapinfos) |
1627 | if (socket.ext_mapinfos) |
1631 | { |
1628 | { |
… | |
… | |
1675 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1672 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1676 | { |
1673 | { |
1677 | ax = 0; |
1674 | ax = 0; |
1678 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1675 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1679 | { |
1676 | { |
1680 | |
|
|
1681 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1677 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1682 | |
1678 | |
1683 | /* If this space is out of the normal viewable area, we only check |
1679 | /* If this space is out of the normal viewable area, we only check |
1684 | * the heads value ax or ay will only be greater than what |
1680 | * the heads value ax or ay will only be greater than what |
1685 | * the client wants if using the map1a command - this is because |
1681 | * the client wants if using the map1a command - this is because |
… | |
… | |
1747 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1743 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1748 | } |
1744 | } |
1749 | } |
1745 | } |
1750 | else if (d > 3) |
1746 | else if (d > 3) |
1751 | { |
1747 | { |
|
|
1748 | m->touch (); |
|
|
1749 | |
1752 | int need_send = 0, count; |
1750 | int need_send = 0, count; |
1753 | |
1751 | |
1754 | /* This block deals with spaces that are not visible for whatever |
1752 | /* This block deals with spaces that are not visible for whatever |
1755 | * reason. Still may need to send the head for this space. |
1753 | * reason. Still may need to send the head for this space. |
1756 | */ |
1754 | */ |
… | |
… | |
1789 | else |
1787 | else |
1790 | sl.reset (oldlen); |
1788 | sl.reset (oldlen); |
1791 | } |
1789 | } |
1792 | else |
1790 | else |
1793 | { |
1791 | { |
|
|
1792 | m->touch (); |
|
|
1793 | |
1794 | /* In this block, the space is visible or there are head objects |
1794 | /* In this block, the space is visible or there are head objects |
1795 | * we need to send. |
1795 | * we need to send. |
1796 | */ |
1796 | */ |
1797 | |
1797 | |
1798 | /* Rather than try to figure out what everything that we might |
1798 | /* Rather than try to figure out what everything that we might |
… | |
… | |
1992 | void |
1992 | void |
1993 | draw_client_map (object *pl) |
1993 | draw_client_map (object *pl) |
1994 | { |
1994 | { |
1995 | int i, j; |
1995 | int i, j; |
1996 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1996 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1997 | New_Face *face, *floor; |
1997 | facetile *face, *floor; |
1998 | New_Face *floor2; |
1998 | facetile *floor2; |
1999 | int d, mflags; |
1999 | int d, mflags; |
2000 | struct Map newmap; |
2000 | struct Map newmap; |
2001 | maptile *m, *pm; |
2001 | maptile *m, *pm; |
2002 | |
2002 | |
2003 | if (pl->type != PLAYER) |
2003 | if (pl->type != PLAYER) |
… | |
… | |
2015 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2015 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2016 | return; |
2016 | return; |
2017 | |
2017 | |
2018 | memset (&newmap, 0, sizeof (struct Map)); |
2018 | memset (&newmap, 0, sizeof (struct Map)); |
2019 | |
2019 | |
2020 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2020 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2021 | { |
|
|
2022 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2021 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2023 | { |
2022 | { |
2024 | ax = i; |
2023 | ax = i; |
2025 | ay = j; |
2024 | ay = j; |
2026 | m = pm; |
2025 | m = pm; |
2027 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2026 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2028 | |
2027 | |
2029 | if (mflags & P_OUT_OF_MAP) |
2028 | if (mflags & P_OUT_OF_MAP) |
2030 | continue; |
2029 | continue; |
2031 | |
2030 | |
2032 | if (mflags & P_NEED_UPDATE) |
|
|
2033 | update_position (m, ax, ay); |
|
|
2034 | |
|
|
2035 | /* If a map is visible to the player, we don't want to swap it out |
2031 | /* If a map is visible to the player, we don't want to swap it out |
2036 | * just to reload it. This should really call something like |
2032 | * just to reload it. This should really call something like |
2037 | * swap_map, but this is much more efficient and 'good enough' |
2033 | * swap_map, but this is much more efficient and 'good enough' |
2038 | */ |
2034 | */ |
2039 | if (mflags & P_NEW_MAP) |
2035 | if (mflags & P_NEW_MAP) |
2040 | m->timeout = 50; |
2036 | m->timeout = 50; |
2041 | } |
2037 | } |
2042 | } |
2038 | |
2043 | /* do LOS after calls to update_position */ |
2039 | /* do LOS after calls to update_position */ |
2044 | if (pl->contr->do_los) |
2040 | if (pl->contr->do_los) |
2045 | { |
2041 | { |
2046 | update_los (pl); |
2042 | update_los (pl); |
2047 | pl->contr->do_los = 0; |
2043 | pl->contr->do_los = 0; |
… | |
… | |
2062 | |
2058 | |
2063 | /*****************************************************************************/ |
2059 | /*****************************************************************************/ |
2064 | void |
2060 | void |
2065 | send_plugin_custom_message (object *pl, char *buf) |
2061 | send_plugin_custom_message (object *pl, char *buf) |
2066 | { |
2062 | { |
2067 | pl->contr->socket->send_packet (buf); |
2063 | pl->contr->ns->send_packet (buf); |
2068 | } |
2064 | } |
2069 | |
2065 | |
2070 | /** |
2066 | /** |
2071 | * This sends the skill number to name mapping. We ignore |
2067 | * This sends the skill number to name mapping. We ignore |
2072 | * the params - we always send the same info no matter what. |
2068 | * the params - we always send the same info no matter what. |
… | |
… | |
2117 | * it then sends an updspell packet for each spell that has changed in this way |
2113 | * it then sends an updspell packet for each spell that has changed in this way |
2118 | */ |
2114 | */ |
2119 | void |
2115 | void |
2120 | esrv_update_spells (player *pl) |
2116 | esrv_update_spells (player *pl) |
2121 | { |
2117 | { |
|
|
2118 | if (!pl->ns) |
|
|
2119 | return; |
|
|
2120 | |
2122 | if (!pl->socket->monitor_spells) |
2121 | if (!pl->ns->monitor_spells) |
2123 | return; |
2122 | return; |
2124 | |
2123 | |
2125 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2124 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2126 | { |
2125 | { |
2127 | if (spell->type == SPELL) |
2126 | if (spell->type == SPELL) |
… | |
… | |
2157 | |
2156 | |
2158 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2157 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2159 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2158 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2160 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2159 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2161 | |
2160 | |
2162 | pl->socket->send_packet (sl); |
2161 | pl->ns->send_packet (sl); |
2163 | } |
2162 | } |
2164 | } |
2163 | } |
2165 | } |
2164 | } |
2166 | } |
2165 | } |
2167 | |
2166 | |
2168 | void |
2167 | void |
2169 | esrv_remove_spell (player *pl, object *spell) |
2168 | esrv_remove_spell (player *pl, object *spell) |
2170 | { |
2169 | { |
2171 | if (!pl->socket->monitor_spells) |
2170 | if (!pl->ns->monitor_spells) |
2172 | return; |
2171 | return; |
2173 | |
2172 | |
2174 | if (!pl || !spell || spell->env != pl->ob) |
2173 | if (!pl || !spell || spell->env != pl->ob) |
2175 | { |
2174 | { |
2176 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2175 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2177 | return; |
2176 | return; |
2178 | } |
2177 | } |
2179 | |
2178 | |
2180 | packet sl; |
2179 | packet sl ("delspell"); |
2181 | |
2180 | |
2182 | sl << "delspell " |
|
|
2183 | << uint32 (spell->count); |
2181 | sl << uint32 (spell->count); |
2184 | |
2182 | |
2185 | pl->socket->send_packet (sl); |
2183 | pl->ns->send_packet (sl); |
2186 | } |
2184 | } |
2187 | |
2185 | |
2188 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2186 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2189 | static void |
2187 | static void |
2190 | append_spell (player *pl, packet &sl, object *spell) |
2188 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2238 | { |
2236 | { |
2239 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2237 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2240 | return; |
2238 | return; |
2241 | } |
2239 | } |
2242 | |
2240 | |
2243 | if (!pl->socket->monitor_spells) |
2241 | if (!pl->ns->monitor_spells) |
2244 | return; |
2242 | return; |
2245 | |
2243 | |
2246 | packet sl; |
2244 | packet sl ("addspell"); |
2247 | sl << "addspell "; |
|
|
2248 | |
2245 | |
2249 | if (!spell) |
2246 | if (!spell) |
2250 | { |
2247 | { |
2251 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2248 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2252 | { |
2249 | { |
… | |
… | |
2266 | if (spell->type != SPELL) |
2263 | if (spell->type != SPELL) |
2267 | continue; |
2264 | continue; |
2268 | |
2265 | |
2269 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2266 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2270 | { |
2267 | { |
2271 | pl->socket->send_packet (sl); |
2268 | pl->ns->send_packet (sl); |
2272 | |
2269 | |
2273 | sl.reset (); |
2270 | sl.reset (); |
2274 | sl << "addspell "; |
2271 | sl << "addspell "; |
2275 | } |
2272 | } |
2276 | |
2273 | |
… | |
… | |
2290 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2287 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2291 | fatal (0); |
2288 | fatal (0); |
2292 | } |
2289 | } |
2293 | |
2290 | |
2294 | /* finally, we can send the packet */ |
2291 | /* finally, we can send the packet */ |
2295 | pl->socket->send_packet (sl); |
2292 | pl->ns->send_packet (sl); |
2296 | } |
2293 | } |
2297 | |
2294 | |