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 | |
… | |
… | |
138 | } |
136 | } |
139 | |
137 | |
140 | static void |
138 | static void |
141 | clear_map (player *pl) |
139 | clear_map (player *pl) |
142 | { |
140 | { |
143 | client &socket = *pl->socket; |
|
|
144 | |
|
|
145 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
141 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
146 | |
142 | |
147 | if (socket.newmapcmd == 1) |
143 | if (pl->ns->newmapcmd == 1) |
148 | socket.send_packet ("newmap"); |
144 | pl->ns->send_packet ("newmap"); |
149 | |
145 | |
150 | socket.update_look = 1; |
146 | pl->ns->floorbox_reset (); |
151 | socket.look_position = 0; |
|
|
152 | } |
147 | } |
153 | |
148 | |
154 | /** check for map change and send new map data */ |
149 | /** check for map/region change and send new map data */ |
155 | static void |
150 | static void |
156 | check_map_change (player *pl) |
151 | check_map_change (player *pl) |
157 | { |
152 | { |
158 | client &socket = *pl->socket; |
153 | client &socket = *pl->ns; |
159 | object *ob = pl->ob; |
154 | object *ob = pl->ob; |
160 | char buf[MAX_BUF]; /* eauugggh */ |
155 | char buf[MAX_BUF]; /* eauugggh */ |
161 | |
156 | |
162 | if (socket.current_map != ob->map) |
157 | if (socket.current_map != ob->map) |
163 | { |
158 | { |
… | |
… | |
179 | flags |= 4; |
174 | flags |= 4; |
180 | if (ob->map->tile_path[3]) |
175 | if (ob->map->tile_path[3]) |
181 | flags |= 8; |
176 | flags |= 8; |
182 | |
177 | |
183 | 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", |
184 | 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); |
185 | } |
180 | } |
186 | else |
181 | else |
187 | snprintf (buf, MAX_BUF, "mapinfo current"); |
182 | snprintf (buf, MAX_BUF, "mapinfo current"); |
188 | |
183 | |
189 | socket.send_packet (buf); |
184 | socket.send_packet (buf); |
… | |
… | |
197 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
192 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
198 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
193 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
199 | else |
194 | else |
200 | { |
195 | { |
201 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
196 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
202 | socket.update_look = 1; |
197 | socket.floorbox_reset (); |
203 | socket.look_position = 0; |
|
|
204 | } |
198 | } |
205 | } |
199 | } |
206 | |
200 | |
207 | socket.current_x = ob->x; |
201 | socket.current_x = ob->x; |
208 | 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 | } |
209 | } |
210 | } |
210 | |
211 | |
211 | /** |
212 | /** |
212 | * RequestInfo is sort of a meta command. There is some specific |
213 | * RequestInfo is sort of a meta command. There is some specific |
213 | * request of information, but we call other functions to provide |
214 | * request of information, but we call other functions to provide |
… | |
… | |
257 | { |
258 | { |
258 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
259 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
259 | } |
260 | } |
260 | |
261 | |
261 | void |
262 | void |
|
|
263 | ExtiCmd (char *buf, int len, client *ns) |
|
|
264 | { |
|
|
265 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
266 | } |
|
|
267 | |
|
|
268 | void |
262 | MapInfoCmd (char *buf, int len, player *pl) |
269 | MapInfoCmd (char *buf, int len, player *pl) |
263 | { |
270 | { |
264 | // <mapinfo tag spatial tile-path |
271 | // <mapinfo tag spatial tile-path |
265 | // >mapinfo tag spatial flags x y w h hash |
272 | // >mapinfo tag spatial flags x y w h hash |
266 | |
273 | |
… | |
… | |
278 | buf += 8; |
285 | buf += 8; |
279 | |
286 | |
280 | // initial map and its origin |
287 | // initial map and its origin |
281 | maptile *map = pl->ob->map; |
288 | maptile *map = pl->ob->map; |
282 | sint16 dx, dy; |
289 | sint16 dx, dy; |
283 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
290 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
284 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
291 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
285 | int max_distance = 8; // limit maximum path length to something generous |
292 | int max_distance = 8; // limit maximum path length to something generous |
286 | |
293 | |
287 | while (*buf && map && max_distance) |
294 | while (*buf && map && max_distance) |
288 | { |
295 | { |
289 | int dir = *buf++; |
296 | int dir = *buf++; |
290 | |
297 | |
291 | switch (dir) |
298 | switch (dir) |
292 | { |
299 | { |
293 | case '1': |
300 | case '1': |
294 | dx = 0; |
301 | dx = 0; |
295 | dy = -1; |
302 | dy = -1; |
296 | map = get_map_from_coord (map, &dx, &dy); |
303 | map = map->xy_find (dx, dy); |
297 | map && (mapy -= map->height); |
304 | map && (mapy -= map->height); |
298 | break; |
305 | break; |
299 | case '2': |
306 | case '2': |
300 | mapx += map->width; |
307 | mapx += map->width; |
301 | dx = map->width; |
308 | dx = map->width; |
302 | dy = 0; |
309 | dy = 0; |
303 | map = get_map_from_coord (map, &dx, &dy); |
310 | map = map->xy_find (dx, dy); |
304 | break; |
311 | break; |
305 | case '3': |
312 | case '3': |
306 | mapy += map->height; |
313 | mapy += map->height; |
307 | dx = 0; |
314 | dx = 0; |
308 | dy = map->height; |
315 | dy = map->height; |
309 | map = get_map_from_coord (map, &dx, &dy); |
316 | map = map->xy_find (dx, dy); |
310 | break; |
317 | break; |
311 | case '4': |
318 | case '4': |
312 | dx = -1; |
319 | dx = -1; |
313 | dy = 0; |
320 | dy = 0; |
314 | map = get_map_from_coord (map, &dx, &dy); |
321 | map = map->xy_find (dx, dy); |
315 | map && (mapx -= map->width); |
322 | map && (mapx -= map->width); |
316 | break; |
323 | break; |
317 | } |
324 | } |
318 | |
325 | |
319 | --max_distance; |
326 | --max_distance; |
320 | } |
327 | } |
321 | |
328 | |
… | |
… | |
332 | if (map->tile_path[2]) |
339 | if (map->tile_path[2]) |
333 | flags |= 4; |
340 | flags |= 4; |
334 | if (map->tile_path[3]) |
341 | if (map->tile_path[3]) |
335 | flags |= 8; |
342 | flags |= 8; |
336 | |
343 | |
337 | 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); |
338 | } |
345 | } |
339 | else |
346 | else |
340 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
347 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
341 | } |
348 | } |
342 | else |
349 | else |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
350 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
344 | |
351 | |
345 | pl->socket->send_packet (bigbuf); |
352 | pl->ns->send_packet (bigbuf); |
346 | } |
353 | } |
347 | |
354 | |
348 | /** This is the Setup cmd - easy first implementation */ |
355 | /** This is the Setup cmd - easy first implementation */ |
349 | void |
356 | void |
350 | SetUp (char *buf, int len, client * ns) |
357 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
397 | { |
404 | { |
398 | ns->sound = atoi (param); |
405 | ns->sound = atoi (param); |
399 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
400 | } |
407 | } |
401 | else if (!strcmp (cmd, "exp64")) |
408 | else if (!strcmp (cmd, "exp64")) |
402 | { |
|
|
403 | ns->exp64 = atoi (param); |
|
|
404 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
405 | } |
|
|
406 | else if (!strcmp (cmd, "spellmon")) |
410 | else if (!strcmp (cmd, "spellmon")) |
407 | { |
411 | { |
408 | ns->monitor_spells = atoi (param); |
412 | ns->monitor_spells = atoi (param); |
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
413 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
410 | } |
414 | } |
… | |
… | |
567 | * 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. |
568 | */ |
572 | */ |
569 | void |
573 | void |
570 | AddMeCmd (char *buf, int len, client * ns) |
574 | AddMeCmd (char *buf, int len, client * ns) |
571 | { |
575 | { |
572 | if (ns->status != Ns_Add || add_player (ns)) |
576 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
573 | ns->send_packet ("addme_failed"); |
|
|
574 | else |
|
|
575 | ns->send_packet ("addme_success"); |
|
|
576 | } |
577 | } |
577 | |
578 | |
578 | /** Reply to ExtendedInfos command */ |
579 | /** Reply to ExtendedInfos command */ |
579 | void |
580 | void |
580 | ToggleExtendedInfos (char *buf, int len, client * ns) |
581 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
717 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
718 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
718 | esrv_send_face (ns, smoothface, 0); |
719 | esrv_send_face (ns, smoothface, 0); |
719 | |
720 | |
720 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
721 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
721 | |
722 | |
722 | packet sl; |
723 | packet sl ("smooth"); |
723 | |
724 | |
724 | sl << "smooth " |
|
|
725 | << uint16 (face) |
725 | sl << uint16 (face) |
726 | << uint16 (smoothface); |
726 | << uint16 (smoothface); |
727 | |
727 | |
728 | ns->send_packet (sl); |
728 | ns->send_packet (sl); |
729 | } |
729 | } |
730 | |
730 | |
… | |
… | |
802 | * commands. |
802 | * commands. |
803 | */ |
803 | */ |
804 | pl->count = 0; |
804 | pl->count = 0; |
805 | |
805 | |
806 | //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 |
807 | int time = FABS (pl->ob->speed) < 0.001 |
807 | int time = fabs (pl->ob->speed) < 0.001 |
808 | ? time = MAX_TIME * 100 |
808 | ? time = MAX_TIME * 100 |
809 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
809 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
810 | |
810 | |
811 | /* Send confirmation of command execution now */ |
811 | /* Send confirmation of command execution now */ |
812 | packet sl; |
812 | packet sl ("comc"); |
813 | sl << "comc " << uint16 (cmdid) << uint32 (time); |
813 | sl << uint16 (cmdid) << uint32 (time); |
814 | pl->socket->send_packet (sl); |
814 | pl->ns->send_packet (sl); |
815 | } |
815 | } |
816 | |
|
|
817 | |
816 | |
818 | /** This is a reply to a previous query. */ |
817 | /** This is a reply to a previous query. */ |
819 | void |
818 | void |
820 | ReplyCmd (char *buf, int len, player *pl) |
819 | ReplyCmd (char *buf, int len, client *ns) |
821 | { |
820 | { |
|
|
821 | if (ns->state == ST_CUSTOM) |
|
|
822 | { |
|
|
823 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
824 | return; |
|
|
825 | } |
|
|
826 | |
|
|
827 | if (!ns->pl) |
|
|
828 | return; //TODO: depends on the exact reply we are after |
|
|
829 | //TODO: but right now, we always have a ns->pl |
|
|
830 | |
|
|
831 | player *pl = ns->pl; |
|
|
832 | |
822 | /* This is to synthesize how the data would be stored if it |
833 | /* This is to synthesize how the data would be stored if it |
823 | * was normally entered. A bit of a hack, and should be cleaned up |
834 | * was normally entered. A bit of a hack, and should be cleaned up |
824 | * once all the X11 code is removed from the server. |
835 | * once all the X11 code is removed from the server. |
825 | * |
836 | * |
826 | * We pass 13 to many of the functions because this way they |
837 | * We pass 13 to many of the functions because this way they |
… | |
… | |
829 | */ |
840 | */ |
830 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
841 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
831 | |
842 | |
832 | /* this avoids any hacking here */ |
843 | /* this avoids any hacking here */ |
833 | |
844 | |
834 | switch (pl->state) |
845 | switch (ns->state) |
835 | { |
846 | { |
836 | case ST_PLAYING: |
847 | case ST_PLAYING: |
837 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
848 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
838 | break; |
849 | break; |
839 | |
850 | |
840 | case ST_PLAY_AGAIN: |
|
|
841 | /* We can check this for return value (2==quit). Maybe we |
|
|
842 | * should, and do something appropriate? |
|
|
843 | */ |
|
|
844 | receive_play_again (pl->ob, buf[0]); |
|
|
845 | break; |
|
|
846 | |
|
|
847 | case ST_ROLL_STAT: |
|
|
848 | key_roll_stat (pl->ob, buf[0]); |
|
|
849 | break; |
|
|
850 | |
|
|
851 | case ST_CHANGE_CLASS: |
851 | case ST_CHANGE_CLASS: |
852 | |
|
|
853 | key_change_class (pl->ob, buf[0]); |
852 | key_change_class (pl->ob, buf[0]); |
854 | break; |
|
|
855 | |
|
|
856 | case ST_CONFIRM_QUIT: |
|
|
857 | key_confirm_quit (pl->ob, buf[0]); |
|
|
858 | break; |
|
|
859 | |
|
|
860 | case ST_CONFIGURE: |
|
|
861 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
862 | pl->state = ST_PLAYING; |
|
|
863 | break; |
|
|
864 | |
|
|
865 | case ST_GET_NAME: |
|
|
866 | receive_player_name (pl->ob, 13); |
|
|
867 | break; |
|
|
868 | |
|
|
869 | case ST_GET_PASSWORD: |
|
|
870 | case ST_CONFIRM_PASSWORD: |
|
|
871 | receive_player_password (pl->ob, 13); |
|
|
872 | break; |
853 | break; |
873 | |
854 | |
874 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
855 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
875 | receive_party_password (pl->ob, 13); |
856 | receive_party_password (pl->ob, 13); |
876 | break; |
857 | break; |
877 | |
858 | |
878 | default: |
859 | default: |
879 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
860 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
880 | } |
861 | } |
881 | } |
862 | } |
882 | |
863 | |
883 | /** |
864 | /** |
884 | * Client tells its version. If there is a mismatch, we close the |
865 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
934 | { |
915 | { |
935 | ns->sound = atoi (buf); |
916 | ns->sound = atoi (buf); |
936 | } |
917 | } |
937 | |
918 | |
938 | /** client wants the map resent */ |
919 | /** client wants the map resent */ |
939 | |
|
|
940 | void |
920 | void |
941 | MapRedrawCmd (char *buf, int len, player *pl) |
921 | MapRedrawCmd (char *buf, int len, player *pl) |
942 | { |
922 | { |
943 | /* 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 |
944 | * 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. |
… | |
… | |
1031 | esrv_update_stats (player *pl) |
1011 | esrv_update_stats (player *pl) |
1032 | { |
1012 | { |
1033 | char buf[MAX_BUF]; |
1013 | char buf[MAX_BUF]; |
1034 | uint16 flags; |
1014 | uint16 flags; |
1035 | |
1015 | |
1036 | packet sl; |
1016 | client *ns = pl->ns; |
1037 | sl << "stats "; |
1017 | if (!ns) |
|
|
1018 | return; |
1038 | |
1019 | |
|
|
1020 | object *ob = pl->ob; |
1039 | if (pl->ob) |
1021 | if (!ob) |
1040 | { |
1022 | return; |
|
|
1023 | |
|
|
1024 | packet sl ("stats"); |
|
|
1025 | |
1041 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1026 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1042 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1027 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1043 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1028 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1044 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1029 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1045 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1030 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1046 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1031 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1047 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1032 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1048 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1049 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1050 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1051 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1033 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1052 | 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); |
1053 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1038 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1054 | } |
|
|
1055 | |
1039 | |
1056 | if (pl->socket->exp64) |
|
|
1057 | for (int s = 0; s < NUM_SKILLS; s++) |
1040 | for (int s = 0; s < NUM_SKILLS; s++) |
1058 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1041 | if (object *skill = pl->last_skill_ob[s]) |
|
|
1042 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1059 | { |
1043 | { |
|
|
1044 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1045 | |
1060 | /* Always send along the level if exp changes. This is only |
1046 | /* Always send along the level if exp changes. This is only |
1061 | * 1 extra byte, but keeps processing simpler. |
1047 | * 1 extra byte, but keeps processing simpler. |
1062 | */ |
1048 | */ |
1063 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1049 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1064 | << uint8 (pl->last_skill_ob[s]->level) |
1050 | << uint8 (skill->level) |
1065 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1051 | << uint64 (skill->stats.exp); |
1066 | |
|
|
1067 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1068 | } |
1052 | } |
1069 | |
1053 | |
1070 | if (pl->socket->exp64) |
|
|
1071 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1054 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1072 | else |
|
|
1073 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1074 | |
|
|
1075 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1055 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1076 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1056 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1077 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1057 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1078 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1058 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1079 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1059 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1080 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1060 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1081 | 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); |
1082 | 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 | |
1083 | flags = 0; |
1064 | flags = 0; |
1084 | |
1065 | |
1085 | if (pl->fire_on) |
1066 | if (pl->fire_on) |
1086 | flags |= SF_FIREON; |
1067 | flags |= SF_FIREON; |
1087 | |
1068 | |
1088 | if (pl->run_on) |
1069 | if (pl->run_on) |
1089 | flags |= SF_RUNON; |
1070 | flags |= SF_RUNON; |
1090 | |
1071 | |
1091 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1072 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1092 | |
1073 | |
1093 | if (pl->socket->sc_version < 1025) |
1074 | if (ns->sc_version < 1025) |
1094 | { 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) } |
1095 | else |
1076 | else |
1096 | for (int i = 0; i < NROFATTACKS; i++) |
1077 | for (int i = 0; i < NROFATTACKS; i++) |
1097 | { |
1078 | { |
1098 | /* Skip ones we won't send */ |
1079 | /* Skip ones we won't send */ |
1099 | if (atnr_cs_stat[i] == -1) |
1080 | if (atnr_cs_stat[i] == -1) |
1100 | continue; |
1081 | continue; |
1101 | |
1082 | |
1102 | 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]); |
1103 | } |
1084 | } |
1104 | |
1085 | |
1105 | if (pl->socket->monitor_spells) |
1086 | if (pl->ns->monitor_spells) |
1106 | { |
1087 | { |
1107 | 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); |
1108 | 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); |
1109 | 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); |
1110 | } |
1091 | } |
1111 | |
1092 | |
1112 | 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 */ |
1113 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1094 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1114 | set_title (pl->ob, buf); |
1095 | set_title (ob, buf); |
1115 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1096 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1116 | |
1097 | |
1117 | /* Only send it away if we have some actual data */ |
1098 | /* Only send it away if we have some actual data */ |
1118 | if (sl.length () > 6) |
1099 | if (sl.length () > 6) |
1119 | pl->socket->send_packet (sl); |
1100 | ns->send_packet (sl); |
1120 | } |
1101 | } |
1121 | |
1102 | |
1122 | /** |
1103 | /** |
1123 | * 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. |
1124 | */ |
1105 | */ |
1125 | void |
1106 | void |
1126 | esrv_new_player (player *pl, uint32 weight) |
1107 | esrv_new_player (player *pl, uint32 weight) |
1127 | { |
1108 | { |
1128 | pl->last_weight = weight; |
1109 | packet sl ("player"); |
1129 | |
|
|
1130 | packet sl; |
|
|
1131 | sl << "player "; |
|
|
1132 | |
1110 | |
1133 | sl << uint32 (pl->ob->count) |
1111 | sl << uint32 (pl->ob->count) |
1134 | << uint32 (weight) |
1112 | << uint32 (weight) |
1135 | << uint32 (pl->ob->face->number) |
1113 | << uint32 (pl->ob->face->number) |
1136 | << data8 (pl->ob->name); |
1114 | << data8 (pl->ob->name); |
1137 | |
1115 | |
|
|
1116 | pl->ns->last_weight = weight; |
1138 | pl->socket->send_packet (sl); |
1117 | pl->ns->send_packet (sl); |
1139 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1118 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1140 | } |
1119 | } |
1141 | |
1120 | |
1142 | /** |
1121 | /** |
1143 | * Need to send an animation sequence to the client. |
1122 | * Need to send an animation sequence to the client. |
… | |
… | |
1157 | { |
1136 | { |
1158 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1137 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1159 | return; |
1138 | return; |
1160 | } |
1139 | } |
1161 | |
1140 | |
1162 | packet sl; |
1141 | packet sl ("anim"); |
1163 | |
1142 | |
1164 | sl << "anim " |
|
|
1165 | << uint16 (anim_num) |
1143 | sl << uint16 (anim_num) |
1166 | << uint16 (0); /* flags - not used right now */ |
1144 | << uint16 (0); /* flags - not used right now */ |
1167 | |
1145 | |
1168 | /* Build up the list of faces. Also, send any information (ie, the |
1146 | /* Build up the list of faces. Also, send any information (ie, the |
1169 | * the face itself) down to the client. |
1147 | * the face itself) down to the client. |
1170 | */ |
1148 | */ |
… | |
… | |
1185 | /****************************************************************************** |
1163 | /****************************************************************************** |
1186 | * |
1164 | * |
1187 | * Start of map related commands. |
1165 | * Start of map related commands. |
1188 | * |
1166 | * |
1189 | ******************************************************************************/ |
1167 | ******************************************************************************/ |
1190 | |
|
|
1191 | /** |
|
|
1192 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1193 | * the face yet, we will also send it. |
|
|
1194 | */ |
|
|
1195 | static void |
|
|
1196 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1197 | { |
|
|
1198 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1199 | { |
|
|
1200 | //TODO: one or the other, can't both have abort and return, verify and act |
|
|
1201 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1202 | return; |
|
|
1203 | abort (); |
|
|
1204 | } |
|
|
1205 | |
|
|
1206 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1207 | newmap->cells[x][y].count++; |
|
|
1208 | |
|
|
1209 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1210 | esrv_send_face (ns, face_num, 0); |
|
|
1211 | } |
|
|
1212 | |
1168 | |
1213 | /** Clears a map cell */ |
1169 | /** Clears a map cell */ |
1214 | static void |
1170 | static void |
1215 | 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) |
1216 | { |
1172 | { |
… | |
… | |
1531 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1487 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1532 | |
1488 | |
1533 | /* 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 |
1534 | * is the blank face, set the smoothlevel to zero. |
1490 | * is the blank face, set the smoothlevel to zero. |
1535 | */ |
1491 | */ |
1536 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1492 | if (!ob || ob->face == blank_face) |
1537 | smoothlevel = 0; |
1493 | smoothlevel = 0; |
1538 | else |
1494 | else |
1539 | { |
1495 | { |
1540 | smoothlevel = ob->smoothlevel; |
1496 | smoothlevel = ob->smoothlevel; |
1541 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1497 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1576 | if (ns->EMI_smooth) |
1532 | if (ns->EMI_smooth) |
1577 | result += 1; /*One byte for smoothlevel */ |
1533 | result += 1; /*One byte for smoothlevel */ |
1578 | } |
1534 | } |
1579 | |
1535 | |
1580 | 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); |
1581 | } |
1559 | } |
1582 | |
1560 | |
1583 | /** |
1561 | /** |
1584 | * 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 |
1585 | * 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 |
… | |
… | |
1591 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1569 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1592 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1570 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1593 | * and use the other 4 bits for other informatiion. For full documentation |
1571 | * and use the other 4 bits for other informatiion. For full documentation |
1594 | * of what we send, see the doc/Protocol file. |
1572 | * of what we send, see the doc/Protocol file. |
1595 | * I will describe internally what we do: |
1573 | * I will describe internally what we do: |
1596 | * the socket->lastmap shows how the map last looked when sent to the client. |
1574 | * the ns->lastmap shows how the map last looked when sent to the client. |
1597 | * in the lastmap structure, there is a cells array, which is set to the |
1575 | * in the lastmap structure, there is a cells array, which is set to the |
1598 | * maximum viewable size (As set in config.h). |
1576 | * maximum viewable size (As set in config.h). |
1599 | * in the cells, there are faces and a count value. |
1577 | * in the cells, there are faces and a count value. |
1600 | * we use the count value to hold the darkness value. If -1, then this space |
1578 | * we use the count value to hold the darkness value. If -1, then this space |
1601 | * is not viewable. |
1579 | * is not viewable. |
… | |
… | |
1612 | uint8 eentrysize; |
1590 | uint8 eentrysize; |
1613 | uint16 ewhatstart, ewhatflag; |
1591 | uint16 ewhatstart, ewhatflag; |
1614 | uint8 extendedinfos; |
1592 | uint8 extendedinfos; |
1615 | maptile *m; |
1593 | maptile *m; |
1616 | |
1594 | |
1617 | client &socket = *pl->contr->socket; |
1595 | client &socket = *pl->contr->ns; |
|
|
1596 | |
|
|
1597 | if (!pl->active) |
|
|
1598 | return; |
1618 | |
1599 | |
1619 | check_map_change (pl->contr); |
1600 | check_map_change (pl->contr); |
|
|
1601 | prefetch_surrounding_maps (pl); |
1620 | |
1602 | |
1621 | packet sl; |
1603 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1622 | packet esl; |
1604 | packet esl; |
1623 | |
1605 | |
1624 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1625 | startlen = sl.length (); |
1606 | startlen = sl.length (); |
1626 | |
1607 | |
1627 | /*Extendedmapinfo structure initialisation */ |
1608 | /*Extendedmapinfo structure initialisation */ |
1628 | if (socket.ext_mapinfos) |
1609 | if (socket.ext_mapinfos) |
1629 | { |
1610 | { |
… | |
… | |
1673 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1654 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1674 | { |
1655 | { |
1675 | ax = 0; |
1656 | ax = 0; |
1676 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1657 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1677 | { |
1658 | { |
1678 | |
|
|
1679 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1659 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1680 | |
1660 | |
1681 | /* If this space is out of the normal viewable area, we only check |
1661 | /* If this space is out of the normal viewable area, we only check |
1682 | * the heads value ax or ay will only be greater than what |
1662 | * the heads value ax or ay will only be greater than what |
1683 | * the client wants if using the map1a command - this is because |
1663 | * the client wants if using the map1a command - this is because |
… | |
… | |
1745 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1725 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1746 | } |
1726 | } |
1747 | } |
1727 | } |
1748 | else if (d > 3) |
1728 | else if (d > 3) |
1749 | { |
1729 | { |
|
|
1730 | m->touch (); |
|
|
1731 | |
1750 | int need_send = 0, count; |
1732 | int need_send = 0, count; |
1751 | |
1733 | |
1752 | /* This block deals with spaces that are not visible for whatever |
1734 | /* This block deals with spaces that are not visible for whatever |
1753 | * reason. Still may need to send the head for this space. |
1735 | * reason. Still may need to send the head for this space. |
1754 | */ |
1736 | */ |
… | |
… | |
1787 | else |
1769 | else |
1788 | sl.reset (oldlen); |
1770 | sl.reset (oldlen); |
1789 | } |
1771 | } |
1790 | else |
1772 | else |
1791 | { |
1773 | { |
|
|
1774 | m->touch (); |
|
|
1775 | |
1792 | /* 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 |
1793 | * we need to send. |
1777 | * we need to send. |
1794 | */ |
1778 | */ |
1795 | |
1779 | |
1796 | /* Rather than try to figure out what everything that we might |
1780 | /* Rather than try to figure out what everything that we might |
… | |
… | |
1989 | */ |
1973 | */ |
1990 | void |
1974 | void |
1991 | draw_client_map (object *pl) |
1975 | draw_client_map (object *pl) |
1992 | { |
1976 | { |
1993 | int i, j; |
1977 | int i, j; |
1994 | 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 */ |
1995 | New_Face *face, *floor; |
|
|
1996 | New_Face *floor2; |
|
|
1997 | int d, mflags; |
1979 | int mflags; |
1998 | struct Map newmap; |
1980 | struct Map newmap; |
1999 | maptile *m, *pm; |
1981 | maptile *m, *pm; |
2000 | |
1982 | |
2001 | if (pl->type != PLAYER) |
1983 | if (pl->type != PLAYER) |
2002 | { |
1984 | { |
… | |
… | |
2013 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1995 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2014 | return; |
1996 | return; |
2015 | |
1997 | |
2016 | memset (&newmap, 0, sizeof (struct Map)); |
1998 | memset (&newmap, 0, sizeof (struct Map)); |
2017 | |
1999 | |
2018 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2000 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2019 | { |
|
|
2020 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2001 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2021 | { |
2002 | { |
2022 | ax = i; |
2003 | ax = i; |
2023 | ay = j; |
2004 | ay = j; |
2024 | m = pm; |
2005 | m = pm; |
2025 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2006 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2026 | |
2007 | |
2027 | if (mflags & P_OUT_OF_MAP) |
2008 | if (mflags & P_OUT_OF_MAP) |
2028 | continue; |
2009 | continue; |
2029 | |
2010 | |
2030 | if (mflags & P_NEED_UPDATE) |
|
|
2031 | update_position (m, ax, ay); |
|
|
2032 | |
|
|
2033 | /* If a map is visible to the player, we don't want to swap it out |
2011 | /* If a map is visible to the player, we don't want to swap it out |
2034 | * just to reload it. This should really call something like |
2012 | * just to reload it. This should really call something like |
2035 | * swap_map, but this is much more efficient and 'good enough' |
2013 | * swap_map, but this is much more efficient and 'good enough' |
2036 | */ |
2014 | */ |
2037 | if (mflags & P_NEW_MAP) |
2015 | if (mflags & P_NEW_MAP) |
2038 | m->timeout = 50; |
2016 | m->timeout = 50; |
2039 | } |
2017 | } |
2040 | } |
2018 | |
2041 | /* do LOS after calls to update_position */ |
2019 | /* do LOS after calls to update_position */ |
2042 | if (pl->contr->do_los) |
2020 | if (pl->contr->do_los) |
2043 | { |
2021 | { |
2044 | update_los (pl); |
2022 | update_los (pl); |
2045 | pl->contr->do_los = 0; |
2023 | pl->contr->do_los = 0; |
… | |
… | |
2060 | |
2038 | |
2061 | /*****************************************************************************/ |
2039 | /*****************************************************************************/ |
2062 | void |
2040 | void |
2063 | send_plugin_custom_message (object *pl, char *buf) |
2041 | send_plugin_custom_message (object *pl, char *buf) |
2064 | { |
2042 | { |
2065 | pl->contr->socket->send_packet (buf); |
2043 | pl->contr->ns->send_packet (buf); |
2066 | } |
2044 | } |
2067 | |
2045 | |
2068 | /** |
2046 | /** |
2069 | * This sends the skill number to name mapping. We ignore |
2047 | * This sends the skill number to name mapping. We ignore |
2070 | * the params - we always send the same info no matter what. |
2048 | * the params - we always send the same info no matter what. |
… | |
… | |
2115 | * 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 |
2116 | */ |
2094 | */ |
2117 | void |
2095 | void |
2118 | esrv_update_spells (player *pl) |
2096 | esrv_update_spells (player *pl) |
2119 | { |
2097 | { |
|
|
2098 | if (!pl->ns) |
|
|
2099 | return; |
|
|
2100 | |
2120 | if (!pl->socket->monitor_spells) |
2101 | if (!pl->ns->monitor_spells) |
2121 | return; |
2102 | return; |
2122 | |
2103 | |
2123 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2104 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2124 | { |
2105 | { |
2125 | if (spell->type == SPELL) |
2106 | if (spell->type == SPELL) |
… | |
… | |
2155 | |
2136 | |
2156 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2137 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2157 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2138 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2158 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2139 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2159 | |
2140 | |
2160 | pl->socket->send_packet (sl); |
2141 | pl->ns->send_packet (sl); |
2161 | } |
2142 | } |
2162 | } |
2143 | } |
2163 | } |
2144 | } |
2164 | } |
2145 | } |
2165 | |
2146 | |
2166 | void |
2147 | void |
2167 | esrv_remove_spell (player *pl, object *spell) |
2148 | esrv_remove_spell (player *pl, object *spell) |
2168 | { |
2149 | { |
2169 | if (!pl->socket->monitor_spells) |
2150 | if (!pl->ns->monitor_spells) |
2170 | return; |
2151 | return; |
2171 | |
2152 | |
2172 | if (!pl || !spell || spell->env != pl->ob) |
2153 | if (!pl || !spell || spell->env != pl->ob) |
2173 | { |
2154 | { |
2174 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2155 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2175 | return; |
2156 | return; |
2176 | } |
2157 | } |
2177 | |
2158 | |
2178 | packet sl; |
2159 | packet sl ("delspell"); |
2179 | |
2160 | |
2180 | sl << "delspell " |
|
|
2181 | << uint32 (spell->count); |
2161 | sl << uint32 (spell->count); |
2182 | |
2162 | |
2183 | pl->socket->send_packet (sl); |
2163 | pl->ns->send_packet (sl); |
2184 | } |
2164 | } |
2185 | |
2165 | |
2186 | /* 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. */ |
2187 | static void |
2167 | static void |
2188 | append_spell (player *pl, packet &sl, object *spell) |
2168 | append_spell (player *pl, packet &sl, object *spell) |
2189 | { |
2169 | { |
2190 | int len, i, skill = 0; |
2170 | int i, skill = 0; |
2191 | |
2171 | |
2192 | if (!(spell->name)) |
2172 | if (!(spell->name)) |
2193 | { |
2173 | { |
2194 | 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); |
2195 | return; |
2175 | return; |
… | |
… | |
2236 | { |
2216 | { |
2237 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2217 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2238 | return; |
2218 | return; |
2239 | } |
2219 | } |
2240 | |
2220 | |
2241 | if (!pl->socket->monitor_spells) |
2221 | if (!pl->ns->monitor_spells) |
2242 | return; |
2222 | return; |
2243 | |
2223 | |
2244 | packet sl; |
2224 | packet sl ("addspell"); |
2245 | sl << "addspell "; |
|
|
2246 | |
2225 | |
2247 | if (!spell) |
2226 | if (!spell) |
2248 | { |
2227 | { |
2249 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2228 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2250 | { |
2229 | { |
… | |
… | |
2264 | if (spell->type != SPELL) |
2243 | if (spell->type != SPELL) |
2265 | continue; |
2244 | continue; |
2266 | |
2245 | |
2267 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2246 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2268 | { |
2247 | { |
2269 | pl->socket->send_packet (sl); |
2248 | pl->ns->send_packet (sl); |
2270 | |
2249 | |
2271 | sl.reset (); |
2250 | sl.reset (); |
2272 | sl << "addspell "; |
2251 | sl << "addspell "; |
2273 | } |
2252 | } |
2274 | |
2253 | |
… | |
… | |
2288 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2267 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2289 | fatal (0); |
2268 | fatal (0); |
2290 | } |
2269 | } |
2291 | |
2270 | |
2292 | /* finally, we can send the packet */ |
2271 | /* finally, we can send the packet */ |
2293 | pl->socket->send_packet (sl); |
2272 | pl->ns->send_packet (sl); |
2294 | } |
2273 | } |
2295 | |
2274 | |