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 |
… | |
… | |
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 | * 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 | * if a face has not already been sent to the client, it is sent now. |
42 | * |
43 | * |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
44 | * operations |
|
|
45 | * |
|
|
46 | */ |
44 | */ |
47 | |
45 | |
48 | #include <global.h> |
46 | #include <global.h> |
49 | #include <sproto.h> |
47 | #include <sproto.h> |
50 | |
48 | |
51 | #include <newclient.h> |
|
|
52 | #include <newserver.h> |
|
|
53 | #include <living.h> |
49 | #include <living.h> |
54 | #include <commands.h> |
50 | #include <commands.h> |
55 | |
51 | |
56 | /* This block is basically taken from socket.c - I assume if it works there, |
52 | /* This block is basically taken from socket.c - I assume if it works there, |
57 | * it should work here. |
53 | * it should work here. |
… | |
… | |
88 | -1, /* life stealing */ |
84 | -1, /* life stealing */ |
89 | -1 /* Disease - not fully done yet */ |
85 | -1 /* Disease - not fully done yet */ |
90 | }; |
86 | }; |
91 | |
87 | |
92 | static void |
88 | static void |
93 | socket_map_scroll (client_socket * ns, int dx, int dy) |
89 | socket_map_scroll (client *ns, int dx, int dy) |
94 | { |
90 | { |
95 | struct Map newmap; |
91 | struct Map newmap; |
96 | int x, y, mx, my; |
92 | int x, y, mx, my; |
97 | |
93 | |
98 | { |
|
|
99 | packet sl; |
|
|
100 | |
|
|
101 | sl.printf ("map_scroll %d %d", dx, dy); |
94 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
102 | ns->send_packet (sl); |
|
|
103 | } |
|
|
104 | |
95 | |
105 | /* If we are using the Map1aCmd, we may in fact send |
96 | /* If we are using the Map1aCmd, we may in fact send |
106 | * head information that is outside the viewable map. |
97 | * head information that is outside the viewable map. |
107 | * So set the mx,my to the max value we want to |
98 | * So set the mx,my to the max value we want to |
108 | * look for. Removed code to do so - it caused extra |
99 | * look for. Removed code to do so - it caused extra |
… | |
… | |
148 | } |
139 | } |
149 | |
140 | |
150 | static void |
141 | static void |
151 | clear_map (player *pl) |
142 | clear_map (player *pl) |
152 | { |
143 | { |
153 | client_socket &socket = *pl->socket; |
|
|
154 | |
|
|
155 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
144 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
156 | |
145 | |
157 | if (socket.newmapcmd == 1) |
146 | if (pl->ns->newmapcmd == 1) |
158 | socket.send_packet ("newmap"); |
147 | pl->ns->send_packet ("newmap"); |
159 | |
148 | |
160 | socket.update_look = 1; |
149 | pl->ns->floorbox_reset (); |
161 | socket.look_position = 0; |
|
|
162 | } |
150 | } |
163 | |
151 | |
164 | /** check for map change and send new map data */ |
152 | /** check for map change and send new map data */ |
165 | static void |
153 | static void |
166 | check_map_change (player *pl) |
154 | check_map_change (player *pl) |
167 | { |
155 | { |
168 | client_socket &socket = *pl->socket; |
156 | client &socket = *pl->ns; |
169 | object *ob = pl->ob; |
157 | object *ob = pl->ob; |
170 | char buf[MAX_BUF]; /* eauugggh */ |
158 | char buf[MAX_BUF]; /* eauugggh */ |
171 | |
159 | |
172 | if (socket.current_map != ob->map) |
160 | if (socket.current_map != ob->map) |
173 | { |
161 | { |
… | |
… | |
189 | flags |= 4; |
177 | flags |= 4; |
190 | if (ob->map->tile_path[3]) |
178 | if (ob->map->tile_path[3]) |
191 | flags |= 8; |
179 | flags |= 8; |
192 | |
180 | |
193 | 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", |
194 | 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); |
195 | } |
183 | } |
196 | else |
184 | else |
197 | snprintf (buf, MAX_BUF, "mapinfo current"); |
185 | snprintf (buf, MAX_BUF, "mapinfo current"); |
198 | |
186 | |
199 | socket.send_packet (buf); |
187 | socket.send_packet (buf); |
… | |
… | |
207 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
195 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
208 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
196 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
209 | else |
197 | else |
210 | { |
198 | { |
211 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
199 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
212 | socket.update_look = 1; |
200 | socket.floorbox_reset (); |
213 | socket.look_position = 0; |
|
|
214 | } |
201 | } |
215 | } |
202 | } |
216 | |
203 | |
217 | socket.current_x = ob->x; |
204 | socket.current_x = ob->x; |
218 | socket.current_y = ob->y; |
205 | socket.current_y = ob->y; |
219 | } |
206 | } |
220 | |
207 | |
|
|
208 | /** |
|
|
209 | * RequestInfo is sort of a meta command. There is some specific |
|
|
210 | * request of information, but we call other functions to provide |
|
|
211 | * that information. |
|
|
212 | */ |
|
|
213 | void |
|
|
214 | RequestInfo (char *buf, int len, client * ns) |
|
|
215 | { |
|
|
216 | char *params = NULL, *cp; |
|
|
217 | |
|
|
218 | /* No match */ |
|
|
219 | char bigbuf[MAX_BUF]; |
|
|
220 | int slen; |
|
|
221 | |
|
|
222 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
223 | * if we don't find a match. |
|
|
224 | */ |
|
|
225 | strcpy (bigbuf, "replyinfo "); |
|
|
226 | slen = strlen (bigbuf); |
|
|
227 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
228 | |
|
|
229 | /* find the first space, make it null, and update the |
|
|
230 | * params pointer. |
|
|
231 | */ |
|
|
232 | for (cp = buf; *cp != '\0'; cp++) |
|
|
233 | if (*cp == ' ') |
|
|
234 | { |
|
|
235 | *cp = '\0'; |
|
|
236 | params = cp + 1; |
|
|
237 | break; |
|
|
238 | } |
|
|
239 | |
|
|
240 | if (!strcmp (buf, "image_info")) |
|
|
241 | send_image_info (ns, params); |
|
|
242 | else if (!strcmp (buf, "image_sums")) |
|
|
243 | send_image_sums (ns, params); |
|
|
244 | else if (!strcmp (buf, "skill_info")) |
|
|
245 | send_skill_info (ns, params); |
|
|
246 | else if (!strcmp (buf, "spell_paths")) |
|
|
247 | send_spell_paths (ns, params); |
|
|
248 | else |
|
|
249 | ns->send_packet (bigbuf, len); |
|
|
250 | } |
|
|
251 | |
221 | void |
252 | void |
222 | ExtCmd (char *buf, int len, player *pl) |
253 | ExtCmd (char *buf, int len, player *pl) |
223 | { |
254 | { |
224 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
255 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
256 | } |
|
|
257 | |
|
|
258 | void |
|
|
259 | ExtiCmd (char *buf, int len, client *ns) |
|
|
260 | { |
|
|
261 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
225 | } |
262 | } |
226 | |
263 | |
227 | void |
264 | void |
228 | MapInfoCmd (char *buf, int len, player *pl) |
265 | MapInfoCmd (char *buf, int len, player *pl) |
229 | { |
266 | { |
… | |
… | |
244 | buf += 8; |
281 | buf += 8; |
245 | |
282 | |
246 | // initial map and its origin |
283 | // initial map and its origin |
247 | maptile *map = pl->ob->map; |
284 | maptile *map = pl->ob->map; |
248 | sint16 dx, dy; |
285 | sint16 dx, dy; |
249 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
286 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
250 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
287 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
251 | int max_distance = 8; // limit maximum path length to something generous |
288 | int max_distance = 8; // limit maximum path length to something generous |
252 | |
289 | |
253 | while (*buf && map && max_distance) |
290 | while (*buf && map && max_distance) |
254 | { |
291 | { |
255 | int dir = *buf++; |
292 | int dir = *buf++; |
256 | |
293 | |
257 | switch (dir) |
294 | switch (dir) |
258 | { |
295 | { |
259 | case '1': |
296 | case '1': |
260 | dx = 0; |
297 | dx = 0; |
261 | dy = -1; |
298 | dy = -1; |
262 | map = get_map_from_coord (map, &dx, &dy); |
299 | map = map->xy_find (dx, dy); |
263 | map && (mapy -= map->height); |
300 | map && (mapy -= map->height); |
264 | break; |
301 | break; |
265 | case '2': |
302 | case '2': |
266 | mapx += map->width; |
303 | mapx += map->width; |
267 | dx = map->width; |
304 | dx = map->width; |
268 | dy = 0; |
305 | dy = 0; |
269 | map = get_map_from_coord (map, &dx, &dy); |
306 | map = map->xy_find (dx, dy); |
270 | break; |
307 | break; |
271 | case '3': |
308 | case '3': |
272 | mapy += map->height; |
309 | mapy += map->height; |
273 | dx = 0; |
310 | dx = 0; |
274 | dy = map->height; |
311 | dy = map->height; |
275 | map = get_map_from_coord (map, &dx, &dy); |
312 | map = map->xy_find (dx, dy); |
276 | break; |
313 | break; |
277 | case '4': |
314 | case '4': |
278 | dx = -1; |
315 | dx = -1; |
279 | dy = 0; |
316 | dy = 0; |
280 | map = get_map_from_coord (map, &dx, &dy); |
317 | map = map->xy_find (dx, dy); |
281 | map && (mapx -= map->width); |
318 | map && (mapx -= map->width); |
282 | break; |
319 | break; |
283 | } |
320 | } |
284 | |
321 | |
285 | --max_distance; |
322 | --max_distance; |
286 | } |
323 | } |
287 | |
324 | |
… | |
… | |
298 | if (map->tile_path[2]) |
335 | if (map->tile_path[2]) |
299 | flags |= 4; |
336 | flags |= 4; |
300 | if (map->tile_path[3]) |
337 | if (map->tile_path[3]) |
301 | flags |= 8; |
338 | flags |= 8; |
302 | |
339 | |
303 | 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); |
304 | } |
341 | } |
305 | else |
342 | else |
306 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
307 | } |
344 | } |
308 | else |
345 | else |
309 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
310 | |
347 | |
311 | pl->socket->send_packet (bigbuf); |
348 | pl->ns->send_packet (bigbuf); |
312 | } |
349 | } |
313 | |
350 | |
314 | /** This is the Setup cmd - easy first implementation */ |
351 | /** This is the Setup cmd - easy first implementation */ |
315 | void |
352 | void |
316 | SetUp (char *buf, int len, client_socket * ns) |
353 | SetUp (char *buf, int len, client * ns) |
317 | { |
354 | { |
318 | int s, slen; |
355 | int s, slen; |
319 | char *cmd, *param, cmdback[HUGE_BUF]; |
356 | char *cmd, *param, cmdback[HUGE_BUF]; |
320 | |
357 | |
321 | /* run through the cmds of setup |
358 | /* run through the cmds of setup |
… | |
… | |
363 | { |
400 | { |
364 | ns->sound = atoi (param); |
401 | ns->sound = atoi (param); |
365 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
402 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
366 | } |
403 | } |
367 | else if (!strcmp (cmd, "exp64")) |
404 | else if (!strcmp (cmd, "exp64")) |
368 | { |
|
|
369 | ns->exp64 = atoi (param); |
|
|
370 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
405 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
371 | } |
|
|
372 | else if (!strcmp (cmd, "spellmon")) |
406 | else if (!strcmp (cmd, "spellmon")) |
373 | { |
407 | { |
374 | ns->monitor_spells = atoi (param); |
408 | ns->monitor_spells = atoi (param); |
375 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
376 | } |
410 | } |
… | |
… | |
531 | * This is what takes care of it. We tell the client how things worked out. |
565 | * This is what takes care of it. We tell the client how things worked out. |
532 | * I am not sure if this file is the best place for this function. however, |
566 | * I am not sure if this file is the best place for this function. however, |
533 | * 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. |
534 | */ |
568 | */ |
535 | void |
569 | void |
536 | AddMeCmd (char *buf, int len, client_socket * ns) |
570 | AddMeCmd (char *buf, int len, client * ns) |
537 | { |
571 | { |
538 | Settings oldsettings; |
572 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
539 | |
|
|
540 | oldsettings = settings; |
|
|
541 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
542 | ns->send_packet ("addme_failed"); |
|
|
543 | else |
|
|
544 | ns->send_packet ("addme_success"); |
|
|
545 | |
|
|
546 | settings = oldsettings; |
|
|
547 | } |
573 | } |
548 | |
574 | |
549 | /** Reply to ExtendedInfos command */ |
575 | /** Reply to ExtendedInfos command */ |
550 | void |
576 | void |
551 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
577 | ToggleExtendedInfos (char *buf, int len, client * ns) |
552 | { |
578 | { |
553 | char cmdback[MAX_BUF]; |
579 | char cmdback[MAX_BUF]; |
554 | char command[50]; |
580 | char command[50]; |
555 | int info, nextinfo; |
581 | int info, nextinfo; |
556 | |
582 | |
… | |
… | |
607 | #define MSG_TYPE_MONUMENT 5 |
633 | #define MSG_TYPE_MONUMENT 5 |
608 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
634 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
609 | |
635 | |
610 | /** Reply to ExtendedInfos command */ |
636 | /** Reply to ExtendedInfos command */ |
611 | void |
637 | void |
612 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
638 | ToggleExtendedText (char *buf, int len, client * ns) |
613 | { |
639 | { |
614 | char cmdback[MAX_BUF]; |
640 | char cmdback[MAX_BUF]; |
615 | char temp[10]; |
641 | char temp[10]; |
616 | char command[50]; |
642 | char command[50]; |
617 | int info, nextinfo, i, flag; |
643 | int info, nextinfo, i, flag; |
… | |
… | |
668 | * a piece of data from us that we know the client wants. So |
694 | * a piece of data from us that we know the client wants. So |
669 | * if we know the client wants it, might as well push it to the |
695 | * if we know the client wants it, might as well push it to the |
670 | * client. |
696 | * client. |
671 | */ |
697 | */ |
672 | static void |
698 | static void |
673 | SendSmooth (client_socket * ns, uint16 face) |
699 | SendSmooth (client *ns, uint16 face) |
674 | { |
700 | { |
675 | uint16 smoothface; |
701 | uint16 smoothface; |
676 | |
702 | |
677 | /* If we can't find a face, return and set it so we won't try to send this |
703 | /* If we can't find a face, return and set it so we won't try to send this |
678 | * again. |
704 | * again. |
… | |
… | |
688 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
714 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
689 | esrv_send_face (ns, smoothface, 0); |
715 | esrv_send_face (ns, smoothface, 0); |
690 | |
716 | |
691 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
717 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
692 | |
718 | |
693 | packet sl; |
719 | packet sl ("smooth"); |
694 | |
720 | |
695 | sl << "smooth " |
|
|
696 | << uint16 (face) |
721 | sl << uint16 (face) |
697 | << uint16 (smoothface); |
722 | << uint16 (smoothface); |
698 | |
723 | |
699 | ns->send_packet (sl); |
724 | ns->send_packet (sl); |
700 | } |
725 | } |
701 | |
726 | |
702 | /** |
727 | /** |
703 | * Tells client the picture it has to use |
728 | * Tells client the picture it has to use |
704 | * to smooth a picture number given as argument. |
729 | * to smooth a picture number given as argument. |
705 | */ |
730 | */ |
706 | void |
731 | void |
707 | AskSmooth (char *buf, int len, client_socket * ns) |
732 | AskSmooth (char *buf, int len, client *ns) |
708 | { |
733 | { |
709 | uint16 facenbr; |
734 | SendSmooth (ns, atoi (buf)); |
710 | |
|
|
711 | facenbr = atoi (buf); |
|
|
712 | SendSmooth (ns, facenbr); |
|
|
713 | } |
735 | } |
714 | |
736 | |
715 | /** |
737 | /** |
716 | * This handles the general commands from the client (ie, north, fire, cast, |
738 | * This handles the general commands from the client (ie, north, fire, cast, |
717 | * etc.) |
739 | * etc.) |
718 | */ |
740 | */ |
719 | void |
741 | void |
720 | PlayerCmd (char *buf, int len, player *pl) |
742 | PlayerCmd (char *buf, int len, player *pl) |
721 | { |
743 | { |
722 | |
|
|
723 | /* The following should never happen with a proper or honest client. |
|
|
724 | * Therefore, the error message doesn't have to be too clear - if |
|
|
725 | * someone is playing with a hacked/non working client, this gives them |
|
|
726 | * an idea of the problem, but they deserve what they get |
|
|
727 | */ |
|
|
728 | if (pl->state != ST_PLAYING) |
|
|
729 | { |
|
|
730 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
731 | return; |
|
|
732 | } |
|
|
733 | /* Check if there is a count. In theory, a zero count could also be |
744 | /* Check if there is a count. In theory, a zero count could also be |
734 | * sent, so check for that also. |
745 | * sent, so check for that also. |
735 | */ |
746 | */ |
736 | if (atoi (buf) || buf[0] == '0') |
747 | if (atoi (buf) || buf[0] == '0') |
737 | { |
748 | { |
738 | pl->count = atoi ((char *) buf); |
749 | pl->count = atoi ((char *) buf); |
|
|
750 | |
739 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
751 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
740 | if (!buf) |
752 | if (!buf) |
741 | { |
|
|
742 | #ifdef ESRV_DEBUG |
|
|
743 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
744 | #endif |
|
|
745 | return; |
753 | return; |
746 | } |
754 | |
747 | buf++; |
755 | buf++; |
748 | } |
756 | } |
749 | /* This should not happen anymore. */ |
757 | |
750 | if (pl->ob->speed_left < -1.0) |
|
|
751 | { |
|
|
752 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
753 | } |
|
|
754 | /* In c_new.c */ |
|
|
755 | execute_newserver_command (pl->ob, (char *) buf); |
758 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
759 | |
756 | /* Perhaps something better should be done with a left over count. |
760 | /* Perhaps something better should be done with a left over count. |
757 | * Cleaning up the input should probably be done first - all actions |
761 | * Cleaning up the input should probably be done first - all actions |
758 | * for the command that issued the count should be done before any other |
762 | * for the command that issued the count should be done before any other |
759 | * commands. |
763 | * commands. |
760 | */ |
764 | */ |
761 | |
|
|
762 | pl->count = 0; |
765 | pl->count = 0; |
763 | |
|
|
764 | } |
766 | } |
765 | |
767 | |
766 | |
768 | |
767 | /** |
769 | /** |
768 | * This handles the general commands from the client (ie, north, fire, cast, |
770 | * This handles the general commands from the client (ie, north, fire, cast, |
… | |
… | |
771 | * can throttle. |
773 | * can throttle. |
772 | */ |
774 | */ |
773 | void |
775 | void |
774 | NewPlayerCmd (char *buf, int len, player *pl) |
776 | NewPlayerCmd (char *buf, int len, player *pl) |
775 | { |
777 | { |
776 | int time, repeat; |
|
|
777 | char command[MAX_BUF]; |
|
|
778 | int pktlen; |
|
|
779 | |
|
|
780 | if (len < 7) |
778 | if (len <= 6) |
781 | { |
779 | { |
782 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
780 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
783 | return; |
781 | return; |
784 | } |
782 | } |
785 | |
783 | |
786 | pktlen = net_uint16 ((uint8 *)buf); |
784 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
787 | repeat = net_uint32 ((uint8 *)buf + 2); |
785 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
788 | |
786 | |
789 | /* -1 is special - no repeat, but don't update */ |
787 | /* -1 is special - no repeat, but don't update */ |
790 | if (repeat != -1) |
788 | if (repeat != -1) |
791 | pl->count = repeat; |
789 | pl->count = repeat; |
792 | |
790 | |
793 | if ((len - 4) >= MAX_BUF) |
791 | buf += 6; //len -= 6; |
794 | len = MAX_BUF - 5; |
|
|
795 | |
792 | |
796 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
797 | command[len - 4] = 0; |
|
|
798 | |
|
|
799 | /* This should not happen anymore. */ |
|
|
800 | if (pl->ob->speed_left < -1.0) |
|
|
801 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
802 | |
|
|
803 | /* In c_new.c */ |
|
|
804 | execute_newserver_command (pl->ob, (char *) command); |
793 | execute_newserver_command (pl->ob, buf); |
|
|
794 | |
805 | /* Perhaps something better should be done with a left over count. |
795 | /* Perhaps something better should be done with a left over count. |
806 | * Cleaning up the input should probably be done first - all actions |
796 | * Cleaning up the input should probably be done first - all actions |
807 | * for the command that issued the count should be done before any other |
797 | * for the command that issued the count should be done before any other |
808 | * commands. |
798 | * commands. |
809 | */ |
799 | */ |
810 | pl->count = 0; |
800 | pl->count = 0; |
811 | |
801 | |
|
|
802 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
812 | if (FABS (pl->ob->speed) < 0.001) |
803 | int time = FABS (pl->ob->speed) < 0.001 |
813 | time = MAX_TIME * 100; |
804 | ? time = MAX_TIME * 100 |
814 | else |
|
|
815 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
805 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
816 | |
806 | |
817 | /* Send confirmation of command execution now */ |
807 | /* Send confirmation of command execution now */ |
818 | |
808 | packet sl ("comc"); |
819 | packet sl; |
|
|
820 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
809 | sl << uint16 (cmdid) << uint32 (time); |
821 | pl->socket->send_packet (sl); |
810 | pl->ns->send_packet (sl); |
822 | } |
811 | } |
823 | |
|
|
824 | |
812 | |
825 | /** This is a reply to a previous query. */ |
813 | /** This is a reply to a previous query. */ |
826 | void |
814 | void |
827 | ReplyCmd (char *buf, int len, player *pl) |
815 | ReplyCmd (char *buf, int len, client *ns) |
828 | { |
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 | |
829 | /* 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 |
830 | * 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 |
831 | * once all the X11 code is removed from the server. |
831 | * once all the X11 code is removed from the server. |
832 | * |
832 | * |
833 | * 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 |
834 | * think it was the carriage return that was entered, and the |
834 | * think it was the carriage return that was entered, and the |
835 | * function then does not try to do additional input. |
835 | * function then does not try to do additional input. |
836 | */ |
836 | */ |
837 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
837 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
838 | |
838 | |
839 | /* this avoids any hacking here */ |
839 | /* this avoids any hacking here */ |
840 | |
840 | |
841 | switch (pl->state) |
841 | switch (ns->state) |
842 | { |
842 | { |
843 | case ST_PLAYING: |
843 | case ST_PLAYING: |
844 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
844 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
845 | break; |
845 | break; |
846 | |
846 | |
847 | case ST_PLAY_AGAIN: |
|
|
848 | /* We can check this for return value (2==quit). Maybe we |
|
|
849 | * should, and do something appropriate? |
|
|
850 | */ |
|
|
851 | receive_play_again (pl->ob, buf[0]); |
|
|
852 | break; |
|
|
853 | |
|
|
854 | case ST_ROLL_STAT: |
|
|
855 | key_roll_stat (pl->ob, buf[0]); |
|
|
856 | break; |
|
|
857 | |
|
|
858 | case ST_CHANGE_CLASS: |
847 | case ST_CHANGE_CLASS: |
859 | |
|
|
860 | key_change_class (pl->ob, buf[0]); |
848 | key_change_class (pl->ob, buf[0]); |
861 | break; |
849 | break; |
862 | |
850 | |
863 | case ST_CONFIRM_QUIT: |
|
|
864 | key_confirm_quit (pl->ob, buf[0]); |
|
|
865 | break; |
|
|
866 | |
|
|
867 | case ST_CONFIGURE: |
|
|
868 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
869 | pl->state = ST_PLAYING; |
|
|
870 | break; |
|
|
871 | |
|
|
872 | case ST_GET_NAME: |
|
|
873 | receive_player_name (pl->ob, 13); |
|
|
874 | break; |
|
|
875 | |
|
|
876 | case ST_GET_PASSWORD: |
|
|
877 | case ST_CONFIRM_PASSWORD: |
|
|
878 | receive_player_password (pl->ob, 13); |
|
|
879 | break; |
|
|
880 | |
|
|
881 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
851 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
882 | receive_party_password (pl->ob, 13); |
852 | receive_party_password (pl->ob, 13); |
883 | break; |
853 | break; |
884 | |
854 | |
885 | default: |
855 | default: |
886 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
856 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
887 | } |
857 | } |
888 | } |
858 | } |
889 | |
859 | |
890 | /** |
860 | /** |
891 | * 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 |
… | |
… | |
893 | * something older than the server. If we assume the client will be |
863 | * something older than the server. If we assume the client will be |
894 | * backwards compatible, having it be a later version should not be a |
864 | * backwards compatible, having it be a later version should not be a |
895 | * problem. |
865 | * problem. |
896 | */ |
866 | */ |
897 | void |
867 | void |
898 | VersionCmd (char *buf, int len, client_socket * ns) |
868 | VersionCmd (char *buf, int len, client * ns) |
899 | { |
869 | { |
900 | char *cp; |
|
|
901 | char version_warning[256]; |
|
|
902 | |
|
|
903 | if (!buf) |
870 | if (!buf) |
904 | { |
871 | { |
905 | LOG (llevError, "CS: received corrupted version command\n"); |
872 | LOG (llevError, "CS: received corrupted version command\n"); |
906 | return; |
873 | return; |
907 | } |
874 | } |
908 | |
875 | |
909 | ns->cs_version = atoi (buf); |
876 | ns->cs_version = atoi (buf); |
910 | ns->sc_version = ns->cs_version; |
877 | ns->sc_version = ns->cs_version; |
|
|
878 | |
|
|
879 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
880 | |
|
|
881 | |
|
|
882 | //TODO: should log here just for statistics |
|
|
883 | |
911 | if (VERSION_CS != ns->cs_version) |
884 | //if (VERSION_CS != ns->cs_version) |
912 | { |
885 | // unchecked; |
913 | #ifdef ESRV_DEBUG |
886 | |
914 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
915 | #endif |
|
|
916 | } |
|
|
917 | cp = strchr (buf + 1, ' '); |
887 | char *cp = strchr (buf + 1, ' '); |
918 | if (!cp) |
888 | if (!cp) |
919 | return; |
889 | return; |
|
|
890 | |
920 | ns->sc_version = atoi (cp); |
891 | ns->sc_version = atoi (cp); |
|
|
892 | |
921 | if (VERSION_SC != ns->sc_version) |
893 | //if (VERSION_SC != ns->sc_version) |
922 | { |
894 | // unchecked; |
923 | #ifdef ESRV_DEBUG |
895 | |
924 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
925 | #endif |
|
|
926 | } |
|
|
927 | cp = strchr (cp + 1, ' '); |
896 | cp = strchr (cp + 1, ' '); |
|
|
897 | |
928 | if (cp) |
898 | if (cp) |
929 | { |
899 | { |
930 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
900 | assign (ns->version, cp + 1); |
931 | |
901 | |
932 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
933 | |
|
|
934 | /* This is first implementation - i skip all beta DX clients with it |
|
|
935 | * Add later stuff here for other clients |
|
|
936 | */ |
|
|
937 | |
|
|
938 | /* these are old dxclients */ |
|
|
939 | /* Version 1024 added support for singular + plural name values - |
|
|
940 | * requiing this minimal value reduces complexity of that code, and it |
|
|
941 | * has been around for a long time. |
|
|
942 | */ |
|
|
943 | if (ns->sc_version < 1026) |
902 | if (ns->sc_version < 1026) |
944 | { |
903 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
945 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
946 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
904 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
947 | ns->send_packet (version_warning); |
|
|
948 | } |
|
|
949 | |
|
|
950 | } |
905 | } |
951 | } |
906 | } |
952 | |
907 | |
953 | /** sound related functions. */ |
908 | /** sound related functions. */ |
954 | |
|
|
955 | void |
909 | void |
956 | SetSound (char *buf, int len, client_socket * ns) |
910 | SetSound (char *buf, int len, client * ns) |
957 | { |
911 | { |
958 | ns->sound = atoi (buf); |
912 | ns->sound = atoi (buf); |
959 | } |
913 | } |
960 | |
914 | |
961 | /** client wants the map resent */ |
915 | /** client wants the map resent */ |
962 | |
|
|
963 | void |
916 | void |
964 | MapRedrawCmd (char *buf, int len, player *pl) |
917 | MapRedrawCmd (char *buf, int len, player *pl) |
965 | { |
918 | { |
966 | |
|
|
967 | /* 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 |
968 | * 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. |
969 | * Unfortunately this solution does not work because some client versions send |
921 | * Unfortunately this solution does not work because some client versions send |
970 | * a mapredraw command after receiving a newmap command. |
922 | * a mapredraw command after receiving a newmap command. |
971 | */ |
923 | */ |
972 | #if 0 |
|
|
973 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
974 | * clear the "cache" |
|
|
975 | */ |
|
|
976 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
977 | draw_client_map (pl->ob); |
|
|
978 | #endif |
|
|
979 | } |
924 | } |
980 | |
925 | |
981 | /** |
926 | /** |
982 | * Moves an object (typically, container to inventory). |
927 | * Moves an object (typically, container to inventory). |
983 | * syntax is: move (to) (tag) (nrof) |
928 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
986 | MoveCmd (char *buf, int len, player *pl) |
931 | MoveCmd (char *buf, int len, player *pl) |
987 | { |
932 | { |
988 | int vals[3], i; |
933 | int vals[3], i; |
989 | |
934 | |
990 | /* A little funky here. We only cycle for 2 records, because |
935 | /* A little funky here. We only cycle for 2 records, because |
991 | * we obviously am not going to find a space after the third |
936 | * we obviously are not going to find a space after the third |
992 | * record. Perhaps we should just replace this with a |
937 | * record. Perhaps we should just replace this with a |
993 | * sscanf? |
938 | * sscanf? |
994 | */ |
939 | */ |
995 | for (i = 0; i < 2; i++) |
940 | for (i = 0; i < 2; i++) |
996 | { |
941 | { |
997 | vals[i] = atoi (buf); |
942 | vals[i] = atoi (buf); |
|
|
943 | |
998 | if (!(buf = strchr (buf, ' '))) |
944 | if (!(buf = strchr (buf, ' '))) |
999 | { |
945 | { |
1000 | LOG (llevError, "Incomplete move command: %s\n", buf); |
946 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1001 | return; |
947 | return; |
1002 | } |
948 | } |
|
|
949 | |
1003 | buf++; |
950 | buf++; |
1004 | } |
951 | } |
|
|
952 | |
1005 | vals[2] = atoi (buf); |
953 | vals[2] = atoi (buf); |
1006 | |
954 | |
1007 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
955 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1008 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
956 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1009 | } |
957 | } |
1010 | |
|
|
1011 | |
|
|
1012 | |
958 | |
1013 | /****************************************************************************** |
959 | /****************************************************************************** |
1014 | * |
960 | * |
1015 | * Start of commands the server sends to the client. |
961 | * Start of commands the server sends to the client. |
1016 | * |
962 | * |
… | |
… | |
1019 | /** |
965 | /** |
1020 | * Asks the client to query the user. This way, the client knows |
966 | * Asks the client to query the user. This way, the client knows |
1021 | * it needs to send something back (vs just printing out a message) |
967 | * it needs to send something back (vs just printing out a message) |
1022 | */ |
968 | */ |
1023 | void |
969 | void |
1024 | send_query (client_socket * ns, uint8 flags, char *text) |
970 | send_query (client *ns, uint8 flags, char *text) |
1025 | { |
971 | { |
1026 | char buf[MAX_BUF]; |
|
|
1027 | |
|
|
1028 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
972 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1029 | ns->send_packet (buf); |
|
|
1030 | } |
973 | } |
1031 | |
974 | |
1032 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
975 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1033 | Old = New; \ |
976 | Old = New; \ |
1034 | sl << uint8 (Type) << uint64 (New); \ |
977 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1064 | esrv_update_stats (player *pl) |
1007 | esrv_update_stats (player *pl) |
1065 | { |
1008 | { |
1066 | char buf[MAX_BUF]; |
1009 | char buf[MAX_BUF]; |
1067 | uint16 flags; |
1010 | uint16 flags; |
1068 | |
1011 | |
1069 | packet sl; |
1012 | client *ns = pl->ns; |
1070 | sl << "stats "; |
1013 | if (!ns) |
|
|
1014 | return; |
1071 | |
1015 | |
1072 | if (pl->ob != NULL) |
1016 | object *ob = pl->ob; |
1073 | { |
1017 | if (!ob) |
|
|
1018 | return; |
|
|
1019 | |
|
|
1020 | packet sl ("stats"); |
|
|
1021 | |
1074 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1022 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1075 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1023 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1076 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1024 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1077 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1025 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1078 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1026 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1079 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1027 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1080 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1028 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1081 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1082 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1083 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1084 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1029 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1085 | 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); |
1086 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1034 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1087 | } |
|
|
1088 | |
1035 | |
1089 | if (pl->socket->exp64) |
|
|
1090 | { |
|
|
1091 | uint8 s; |
|
|
1092 | |
|
|
1093 | for (s = 0; s < NUM_SKILLS; s++) |
1036 | for (int s = 0; s < NUM_SKILLS; s++) |
1094 | { |
1037 | if (object *skill = pl->last_skill_ob[s]) |
1095 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1038 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1096 | { |
1039 | { |
|
|
1040 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1041 | |
1097 | /* Always send along the level if exp changes. This is only |
1042 | /* Always send along the level if exp changes. This is only |
1098 | * 1 extra byte, but keeps processing simpler. |
1043 | * 1 extra byte, but keeps processing simpler. |
1099 | */ |
1044 | */ |
1100 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1045 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1101 | << uint8 (pl->last_skill_ob[s]->level) |
1046 | << uint8 (skill->level) |
1102 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1047 | << uint64 (skill->stats.exp); |
1103 | |
|
|
1104 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1105 | } |
1048 | } |
1106 | } |
|
|
1107 | } |
|
|
1108 | |
1049 | |
1109 | if (pl->socket->exp64) |
|
|
1110 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1050 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1111 | else |
|
|
1112 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1113 | |
|
|
1114 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1051 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1115 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1052 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1116 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1053 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1117 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1054 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1118 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1055 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1119 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1056 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1120 | 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); |
1121 | 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 | |
1122 | flags = 0; |
1060 | flags = 0; |
1123 | |
1061 | |
1124 | if (pl->fire_on) |
1062 | if (pl->fire_on) |
1125 | flags |= SF_FIREON; |
1063 | flags |= SF_FIREON; |
1126 | |
1064 | |
1127 | if (pl->run_on) |
1065 | if (pl->run_on) |
1128 | flags |= SF_RUNON; |
1066 | flags |= SF_RUNON; |
1129 | |
1067 | |
1130 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1068 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1131 | |
1069 | |
1132 | if (pl->socket->sc_version < 1025) |
1070 | if (ns->sc_version < 1025) |
1133 | { 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) } |
1134 | else |
1072 | else |
1135 | { |
|
|
1136 | int i; |
|
|
1137 | |
|
|
1138 | for (i = 0; i < NROFATTACKS; i++) |
1073 | for (int i = 0; i < NROFATTACKS; i++) |
1139 | { |
1074 | { |
1140 | /* Skip ones we won't send */ |
1075 | /* Skip ones we won't send */ |
1141 | if (atnr_cs_stat[i] == -1) |
1076 | if (atnr_cs_stat[i] == -1) |
1142 | continue; |
1077 | continue; |
1143 | |
1078 | |
1144 | 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]); |
1145 | } |
1080 | } |
1146 | } |
|
|
1147 | |
1081 | |
1148 | if (pl->socket->monitor_spells) |
1082 | if (pl->ns->monitor_spells) |
1149 | { |
1083 | { |
1150 | 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); |
1151 | 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); |
1152 | 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); |
1153 | } |
1087 | } |
1154 | |
1088 | |
1155 | 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 */ |
1156 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1090 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1157 | set_title (pl->ob, buf); |
1091 | set_title (ob, buf); |
1158 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1092 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1159 | |
1093 | |
1160 | /* Only send it away if we have some actual data */ |
1094 | /* Only send it away if we have some actual data */ |
1161 | if (sl.length () > 6) |
1095 | if (sl.length () > 6) |
1162 | pl->socket->send_packet (sl); |
1096 | ns->send_packet (sl); |
1163 | } |
1097 | } |
1164 | |
1098 | |
1165 | /** |
1099 | /** |
1166 | * 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. |
1167 | */ |
1101 | */ |
1168 | void |
1102 | void |
1169 | esrv_new_player (player *pl, uint32 weight) |
1103 | esrv_new_player (player *pl, uint32 weight) |
1170 | { |
1104 | { |
1171 | pl->last_weight = weight; |
1105 | packet sl ("player"); |
1172 | |
|
|
1173 | packet sl; |
|
|
1174 | sl << "player "; |
|
|
1175 | |
1106 | |
1176 | sl << uint32 (pl->ob->count) |
1107 | sl << uint32 (pl->ob->count) |
1177 | << uint32 (weight) |
1108 | << uint32 (weight) |
1178 | << uint32 (pl->ob->face->number) |
1109 | << uint32 (pl->ob->face->number) |
1179 | << data8 (pl->ob->name); |
1110 | << data8 (pl->ob->name); |
1180 | |
1111 | |
|
|
1112 | pl->ns->last_weight = weight; |
1181 | pl->socket->send_packet (sl); |
1113 | pl->ns->send_packet (sl); |
1182 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1114 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1183 | } |
1115 | } |
1184 | |
1116 | |
1185 | /** |
1117 | /** |
1186 | * Need to send an animation sequence to the client. |
1118 | * Need to send an animation sequence to the client. |
… | |
… | |
1188 | * sent them the face yet (this can become quite costly in terms of |
1120 | * sent them the face yet (this can become quite costly in terms of |
1189 | * how much we are sending - on the other hand, this should only happen |
1121 | * how much we are sending - on the other hand, this should only happen |
1190 | * when the player logs in and picks stuff up. |
1122 | * when the player logs in and picks stuff up. |
1191 | */ |
1123 | */ |
1192 | void |
1124 | void |
1193 | esrv_send_animation (client_socket * ns, short anim_num) |
1125 | esrv_send_animation (client * ns, short anim_num) |
1194 | { |
1126 | { |
1195 | int i; |
|
|
1196 | |
|
|
1197 | /* Do some checking on the anim_num we got. Note that the animations |
1127 | /* Do some checking on the anim_num we got. Note that the animations |
1198 | * are added in contigous order, so if the number is in the valid |
1128 | * are added in contigous order, so if the number is in the valid |
1199 | * range, it must be a valid animation. |
1129 | * range, it must be a valid animation. |
1200 | */ |
1130 | */ |
1201 | if (anim_num < 0 || anim_num > num_animations) |
1131 | if (anim_num < 0 || anim_num > num_animations) |
1202 | { |
1132 | { |
1203 | 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); |
1204 | return; |
1134 | return; |
1205 | } |
1135 | } |
1206 | |
1136 | |
1207 | packet sl; |
1137 | packet sl ("anim"); |
1208 | |
1138 | |
1209 | sl << "anim " |
|
|
1210 | << uint16 (anim_num) |
1139 | sl << uint16 (anim_num) |
1211 | << uint16 (0); /* flags - not used right now */ |
1140 | << uint16 (0); /* flags - not used right now */ |
1212 | |
1141 | |
1213 | /* 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 |
1214 | * the face itself) down to the client. |
1143 | * the face itself) down to the client. |
1215 | */ |
1144 | */ |
1216 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1145 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1217 | { |
1146 | { |
1218 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1147 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1219 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1148 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1149 | |
1220 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1150 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1221 | } |
1151 | } |
1222 | |
1152 | |
1223 | ns->send_packet (sl); |
1153 | ns->send_packet (sl); |
1224 | |
1154 | |
… | |
… | |
1235 | /** |
1165 | /** |
1236 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1166 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1237 | * the face yet, we will also send it. |
1167 | * the face yet, we will also send it. |
1238 | */ |
1168 | */ |
1239 | static void |
1169 | static void |
1240 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
1170 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1241 | { |
1171 | { |
1242 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1172 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1243 | { |
1173 | { |
|
|
1174 | //TODO: one or the other, can't both have abort and return, verify and act |
1244 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1175 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1245 | return; |
1176 | return; |
1246 | abort (); |
1177 | abort (); |
1247 | } |
1178 | } |
1248 | |
1179 | |
1249 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1180 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1250 | newmap->cells[x][y].count++; |
1181 | newmap->cells[x][y].count++; |
1251 | |
1182 | |
1252 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1183 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1253 | esrv_send_face (ns, face_num, 0); |
1184 | esrv_send_face (ns, face_num, 0); |
1254 | } |
|
|
1255 | |
|
|
1256 | struct LayerCell |
|
|
1257 | { |
|
|
1258 | uint16 xy; |
|
|
1259 | short face; |
|
|
1260 | }; |
|
|
1261 | |
|
|
1262 | struct MapLayer |
|
|
1263 | { |
|
|
1264 | int count; |
|
|
1265 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1266 | }; |
|
|
1267 | |
|
|
1268 | /** Checkes if map cells have changed */ |
|
|
1269 | static int |
|
|
1270 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1271 | { |
|
|
1272 | int k; |
|
|
1273 | |
|
|
1274 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1275 | return 1; |
|
|
1276 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1277 | { |
|
|
1278 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1279 | { |
|
|
1280 | return 1; |
|
|
1281 | } |
|
|
1282 | } |
|
|
1283 | return 0; |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | /** |
|
|
1287 | * Basically, what this does is pack the data into layers. |
|
|
1288 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1289 | * this data into. we return the end of the data. layers is |
|
|
1290 | * how many layers of data we should back. |
|
|
1291 | */ |
|
|
1292 | static uint8 * |
|
|
1293 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1294 | { |
|
|
1295 | int x, y, k; |
|
|
1296 | int face; |
|
|
1297 | unsigned char *fcur; |
|
|
1298 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1299 | |
|
|
1300 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1301 | layers[k].count = 0; |
|
|
1302 | fcur = cur; |
|
|
1303 | for (x = 0; x < ns->mapx; x++) |
|
|
1304 | { |
|
|
1305 | for (y = 0; y < ns->mapy; y++) |
|
|
1306 | { |
|
|
1307 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1308 | continue; |
|
|
1309 | if (newmap->cells[x][y].count == 0) |
|
|
1310 | { |
|
|
1311 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1312 | cur++; |
|
|
1313 | continue; |
|
|
1314 | } |
|
|
1315 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1316 | { |
|
|
1317 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1318 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1319 | layers[k].count++; |
|
|
1320 | } |
|
|
1321 | } |
|
|
1322 | } |
|
|
1323 | /* If no data, return now. */ |
|
|
1324 | if (fcur == cur && layers[0].count == 0) |
|
|
1325 | return cur; |
|
|
1326 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1327 | cur++; |
|
|
1328 | /* First pack by layers. */ |
|
|
1329 | for (k = 0; k < numlayers; k++) |
|
|
1330 | { |
|
|
1331 | if (layers[k].count == 0) |
|
|
1332 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1333 | have anything in it either */ |
|
|
1334 | /* Pack by entries in thie layer */ |
|
|
1335 | for (x = 0; x < layers[k].count;) |
|
|
1336 | { |
|
|
1337 | fcur = cur; |
|
|
1338 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1339 | cur++; |
|
|
1340 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1341 | cur++; |
|
|
1342 | face = layers[k].lcells[x].face; |
|
|
1343 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1344 | for (y = x; y < layers[k].count; y++) |
|
|
1345 | { |
|
|
1346 | if (layers[k].lcells[y].face == face) |
|
|
1347 | { |
|
|
1348 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1349 | cur++; |
|
|
1350 | layers[k].lcells[y].face = -1; |
|
|
1351 | } |
|
|
1352 | } |
|
|
1353 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1354 | /* forward over the now redundant data */ |
|
|
1355 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1356 | x++; |
|
|
1357 | } |
|
|
1358 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1359 | } |
|
|
1360 | return cur; |
|
|
1361 | } |
1185 | } |
1362 | |
1186 | |
1363 | /** Clears a map cell */ |
1187 | /** Clears a map cell */ |
1364 | static void |
1188 | static void |
1365 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1189 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1377 | #define MAX_LAYERS 3 |
1201 | #define MAX_LAYERS 3 |
1378 | |
1202 | |
1379 | /* Using a global really isn't a good approach, but saves the over head of |
1203 | /* Using a global really isn't a good approach, but saves the over head of |
1380 | * allocating and deallocating such a block of data each time run through, |
1204 | * allocating and deallocating such a block of data each time run through, |
1381 | * and saves the space of allocating this in the socket object when we only |
1205 | * and saves the space of allocating this in the socket object when we only |
1382 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1206 | * need it for this cycle. If the server is ever threaded, this needs to be |
1383 | * re-examined. |
1207 | * re-examined. |
1384 | */ |
1208 | */ |
1385 | |
|
|
1386 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1209 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1387 | |
1210 | |
1388 | /** |
1211 | /** |
1389 | * Returns true if any of the heads for this |
1212 | * Returns true if any of the heads for this |
1390 | * space is set. Returns false if all are blank - this is used |
1213 | * space is set. Returns false if all are blank - this is used |
1391 | * for empty space checking. |
1214 | * for empty space checking. |
1392 | */ |
1215 | */ |
1393 | static inline int |
1216 | static inline int |
1394 | have_head (int ax, int ay) |
1217 | have_head (int ax, int ay) |
1395 | { |
1218 | { |
1396 | |
|
|
1397 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1219 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1398 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1220 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1399 | return 1; |
1221 | return 1; |
|
|
1222 | |
1400 | return 0; |
1223 | return 0; |
1401 | } |
1224 | } |
1402 | |
1225 | |
1403 | /** |
1226 | /** |
1404 | * check_head is a bit simplistic version of update_space below. |
1227 | * check_head is a bit simplistic version of update_space below. |
1405 | * basically, it only checks the that the head on space ax,ay at layer |
1228 | * basically, it only checks the that the head on space ax,ay at layer |
1406 | * needs to get sent - if so, it adds the data, sending the head |
1229 | * needs to get sent - if so, it adds the data, sending the head |
1407 | * if needed, and returning 1. If this no data needs to get |
1230 | * if needed, and returning 1. If this no data needs to get |
1408 | * sent, it returns zero. |
1231 | * sent, it returns zero. |
1409 | */ |
1232 | */ |
1410 | static int |
1233 | static int |
1411 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1234 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1412 | { |
1235 | { |
1413 | short face_num; |
1236 | short face_num; |
1414 | |
1237 | |
1415 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1238 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1416 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1239 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1448 | * numbers the spaces differently - I think this was a leftover from |
1271 | * numbers the spaces differently - I think this was a leftover from |
1449 | * the map command, where the faces stack up. Sinces that is no longer |
1272 | * the map command, where the faces stack up. Sinces that is no longer |
1450 | * the case, it seems to make more sense to have these layer values |
1273 | * the case, it seems to make more sense to have these layer values |
1451 | * actually match. |
1274 | * actually match. |
1452 | */ |
1275 | */ |
1453 | |
|
|
1454 | static int |
1276 | static int |
1455 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1277 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1456 | { |
1278 | { |
1457 | object *ob, *head; |
1279 | object *ob, *head; |
1458 | uint16 face_num; |
1280 | uint16 face_num; |
1459 | int bx, by, i; |
1281 | int bx, by, i; |
1460 | |
1282 | |
… | |
… | |
1673 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1495 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1674 | * take. |
1496 | * take. |
1675 | */ |
1497 | */ |
1676 | |
1498 | |
1677 | static inline int |
1499 | static inline int |
1678 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1500 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1679 | { |
1501 | { |
1680 | object *ob; |
1502 | object *ob; |
1681 | int smoothlevel; /* old face_num; */ |
1503 | int smoothlevel; /* old face_num; */ |
1682 | |
1504 | |
1683 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1684 | |
1506 | |
1685 | /* 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 |
1686 | * is the blank face, set the smoothlevel to zero. |
1508 | * is the blank face, set the smoothlevel to zero. |
1687 | */ |
1509 | */ |
1688 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1510 | if (!ob || ob->face == blank_face) |
1689 | smoothlevel = 0; |
1511 | smoothlevel = 0; |
1690 | else |
1512 | else |
1691 | { |
1513 | { |
1692 | smoothlevel = ob->smoothlevel; |
1514 | smoothlevel = ob->smoothlevel; |
1693 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1717 | * Returns the size of a data for a map square as returned by |
1539 | * Returns the size of a data for a map square as returned by |
1718 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1540 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1719 | * available. |
1541 | * available. |
1720 | */ |
1542 | */ |
1721 | int |
1543 | int |
1722 | getExtendedMapInfoSize (client_socket * ns) |
1544 | getExtendedMapInfoSize (client * ns) |
1723 | { |
1545 | { |
1724 | int result = 0; |
1546 | int result = 0; |
1725 | |
1547 | |
1726 | if (ns->ext_mapinfos) |
1548 | if (ns->ext_mapinfos) |
1727 | { |
1549 | { |
1728 | if (ns->EMI_smooth) |
1550 | if (ns->EMI_smooth) |
1729 | result += 1; /*One byte for smoothlevel */ |
1551 | result += 1; /*One byte for smoothlevel */ |
1730 | } |
1552 | } |
|
|
1553 | |
1731 | 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); |
1732 | } |
1577 | } |
1733 | |
1578 | |
1734 | /** |
1579 | /** |
1735 | * 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 |
1736 | * 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 |
… | |
… | |
1742 | * 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 |
1743 | * 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, |
1744 | * 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 |
1745 | * of what we send, see the doc/Protocol file. |
1590 | * of what we send, see the doc/Protocol file. |
1746 | * I will describe internally what we do: |
1591 | * I will describe internally what we do: |
1747 | * 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. |
1748 | * 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 |
1749 | * maximum viewable size (As set in config.h). |
1594 | * maximum viewable size (As set in config.h). |
1750 | * in the cells, there are faces and a count value. |
1595 | * in the cells, there are faces and a count value. |
1751 | * 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 |
1752 | * is not viewable. |
1597 | * is not viewable. |
… | |
… | |
1763 | uint8 eentrysize; |
1608 | uint8 eentrysize; |
1764 | uint16 ewhatstart, ewhatflag; |
1609 | uint16 ewhatstart, ewhatflag; |
1765 | uint8 extendedinfos; |
1610 | uint8 extendedinfos; |
1766 | maptile *m; |
1611 | maptile *m; |
1767 | |
1612 | |
1768 | client_socket &socket = *pl->contr->socket; |
1613 | client &socket = *pl->contr->ns; |
|
|
1614 | |
|
|
1615 | if (!pl->active) |
|
|
1616 | return; |
1769 | |
1617 | |
1770 | check_map_change (pl->contr); |
1618 | check_map_change (pl->contr); |
|
|
1619 | prefetch_surrounding_maps (pl); |
1771 | |
1620 | |
1772 | packet sl; |
1621 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1773 | packet esl; |
1622 | packet esl; |
1774 | |
1623 | |
1775 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1776 | startlen = sl.length (); |
1624 | startlen = sl.length (); |
1777 | |
1625 | |
1778 | /*Extendedmapinfo structure initialisation */ |
1626 | /*Extendedmapinfo structure initialisation */ |
1779 | if (socket.ext_mapinfos) |
1627 | if (socket.ext_mapinfos) |
1780 | { |
1628 | { |
… | |
… | |
1824 | 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++) |
1825 | { |
1673 | { |
1826 | ax = 0; |
1674 | ax = 0; |
1827 | 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++) |
1828 | { |
1676 | { |
1829 | |
|
|
1830 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1677 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1831 | |
1678 | |
1832 | /* 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 |
1833 | * 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 |
1834 | * the client wants if using the map1a command - this is because |
1681 | * the client wants if using the map1a command - this is because |
… | |
… | |
1896 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1743 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1897 | } |
1744 | } |
1898 | } |
1745 | } |
1899 | else if (d > 3) |
1746 | else if (d > 3) |
1900 | { |
1747 | { |
|
|
1748 | m->touch (); |
|
|
1749 | |
1901 | int need_send = 0, count; |
1750 | int need_send = 0, count; |
1902 | |
1751 | |
1903 | /* This block deals with spaces that are not visible for whatever |
1752 | /* This block deals with spaces that are not visible for whatever |
1904 | * reason. Still may need to send the head for this space. |
1753 | * reason. Still may need to send the head for this space. |
1905 | */ |
1754 | */ |
… | |
… | |
1938 | else |
1787 | else |
1939 | sl.reset (oldlen); |
1788 | sl.reset (oldlen); |
1940 | } |
1789 | } |
1941 | else |
1790 | else |
1942 | { |
1791 | { |
|
|
1792 | m->touch (); |
|
|
1793 | |
1943 | /* 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 |
1944 | * we need to send. |
1795 | * we need to send. |
1945 | */ |
1796 | */ |
1946 | |
1797 | |
1947 | /* Rather than try to figure out what everything that we might |
1798 | /* Rather than try to figure out what everything that we might |
… | |
… | |
2141 | void |
1992 | void |
2142 | draw_client_map (object *pl) |
1993 | draw_client_map (object *pl) |
2143 | { |
1994 | { |
2144 | int i, j; |
1995 | int i, j; |
2145 | 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 */ |
2146 | New_Face *face, *floor; |
1997 | facetile *face, *floor; |
2147 | New_Face *floor2; |
1998 | facetile *floor2; |
2148 | int d, mflags; |
1999 | int d, mflags; |
2149 | struct Map newmap; |
2000 | struct Map newmap; |
2150 | maptile *m, *pm; |
2001 | maptile *m, *pm; |
2151 | |
2002 | |
2152 | if (pl->type != PLAYER) |
2003 | if (pl->type != PLAYER) |
… | |
… | |
2164 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2015 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2165 | return; |
2016 | return; |
2166 | |
2017 | |
2167 | memset (&newmap, 0, sizeof (struct Map)); |
2018 | memset (&newmap, 0, sizeof (struct Map)); |
2168 | |
2019 | |
2169 | 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++) |
2170 | { |
|
|
2171 | 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++) |
2172 | { |
2022 | { |
2173 | ax = i; |
2023 | ax = i; |
2174 | ay = j; |
2024 | ay = j; |
2175 | m = pm; |
2025 | m = pm; |
2176 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2026 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2027 | |
2177 | if (mflags & P_OUT_OF_MAP) |
2028 | if (mflags & P_OUT_OF_MAP) |
2178 | continue; |
2029 | continue; |
2179 | if (mflags & P_NEED_UPDATE) |
2030 | |
2180 | update_position (m, ax, ay); |
|
|
2181 | /* 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 |
2182 | * just to reload it. This should really call something like |
2032 | * just to reload it. This should really call something like |
2183 | * swap_map, but this is much more efficient and 'good enough' |
2033 | * swap_map, but this is much more efficient and 'good enough' |
2184 | */ |
2034 | */ |
2185 | if (mflags & P_NEW_MAP) |
2035 | if (mflags & P_NEW_MAP) |
2186 | m->timeout = 50; |
2036 | m->timeout = 50; |
2187 | } |
2037 | } |
2188 | } |
2038 | |
2189 | /* do LOS after calls to update_position */ |
2039 | /* do LOS after calls to update_position */ |
2190 | if (pl->contr->do_los) |
2040 | if (pl->contr->do_los) |
2191 | { |
2041 | { |
2192 | update_los (pl); |
2042 | update_los (pl); |
2193 | pl->contr->do_los = 0; |
2043 | pl->contr->do_los = 0; |
… | |
… | |
2208 | |
2058 | |
2209 | /*****************************************************************************/ |
2059 | /*****************************************************************************/ |
2210 | void |
2060 | void |
2211 | send_plugin_custom_message (object *pl, char *buf) |
2061 | send_plugin_custom_message (object *pl, char *buf) |
2212 | { |
2062 | { |
2213 | pl->contr->socket->send_packet (buf); |
2063 | pl->contr->ns->send_packet (buf); |
2214 | } |
2064 | } |
2215 | |
2065 | |
2216 | /** |
2066 | /** |
2217 | * This sends the skill number to name mapping. We ignore |
2067 | * This sends the skill number to name mapping. We ignore |
2218 | * the params - we always send the same info no matter what. |
2068 | * the params - we always send the same info no matter what. |
2219 | */ |
2069 | */ |
2220 | void |
2070 | void |
2221 | send_skill_info (client_socket *ns, char *params) |
2071 | send_skill_info (client *ns, char *params) |
2222 | { |
2072 | { |
2223 | packet sl; |
2073 | packet sl; |
2224 | sl << "replyinfo skill_info\n"; |
2074 | sl << "replyinfo skill_info\n"; |
2225 | |
2075 | |
2226 | for (int i = 1; i < NUM_SKILLS; i++) |
2076 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2238 | /** |
2088 | /** |
2239 | * This sends the spell path to name mapping. We ignore |
2089 | * This sends the spell path to name mapping. We ignore |
2240 | * the params - we always send the same info no matter what. |
2090 | * the params - we always send the same info no matter what. |
2241 | */ |
2091 | */ |
2242 | void |
2092 | void |
2243 | send_spell_paths (client_socket * ns, char *params) |
2093 | send_spell_paths (client * ns, char *params) |
2244 | { |
2094 | { |
2245 | packet sl; |
2095 | packet sl; |
2246 | |
2096 | |
2247 | sl << "replyinfo spell_paths\n"; |
2097 | sl << "replyinfo spell_paths\n"; |
2248 | |
2098 | |
… | |
… | |
2263 | * 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 |
2264 | */ |
2114 | */ |
2265 | void |
2115 | void |
2266 | esrv_update_spells (player *pl) |
2116 | esrv_update_spells (player *pl) |
2267 | { |
2117 | { |
|
|
2118 | if (!pl->ns) |
|
|
2119 | return; |
|
|
2120 | |
2268 | if (!pl->socket->monitor_spells) |
2121 | if (!pl->ns->monitor_spells) |
2269 | return; |
2122 | return; |
2270 | |
2123 | |
2271 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2124 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2272 | { |
2125 | { |
2273 | if (spell->type == SPELL) |
2126 | if (spell->type == SPELL) |
… | |
… | |
2303 | |
2156 | |
2304 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2157 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2305 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2158 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2306 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2159 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2307 | |
2160 | |
2308 | pl->socket->send_packet (sl); |
2161 | pl->ns->send_packet (sl); |
2309 | } |
2162 | } |
2310 | } |
2163 | } |
2311 | } |
2164 | } |
2312 | } |
2165 | } |
2313 | |
2166 | |
2314 | void |
2167 | void |
2315 | esrv_remove_spell (player *pl, object *spell) |
2168 | esrv_remove_spell (player *pl, object *spell) |
2316 | { |
2169 | { |
2317 | if (!pl->socket->monitor_spells) |
2170 | if (!pl->ns->monitor_spells) |
2318 | return; |
2171 | return; |
2319 | |
2172 | |
2320 | if (!pl || !spell || spell->env != pl->ob) |
2173 | if (!pl || !spell || spell->env != pl->ob) |
2321 | { |
2174 | { |
2322 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2175 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2323 | return; |
2176 | return; |
2324 | } |
2177 | } |
2325 | |
2178 | |
2326 | packet sl; |
2179 | packet sl ("delspell"); |
2327 | |
2180 | |
2328 | sl << "delspell " |
|
|
2329 | << uint32 (spell->count); |
2181 | sl << uint32 (spell->count); |
2330 | |
2182 | |
2331 | pl->socket->send_packet (sl); |
2183 | pl->ns->send_packet (sl); |
2332 | } |
2184 | } |
2333 | |
2185 | |
2334 | /* 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. */ |
2335 | static void |
2187 | static void |
2336 | append_spell (player *pl, packet &sl, object *spell) |
2188 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2384 | { |
2236 | { |
2385 | 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"); |
2386 | return; |
2238 | return; |
2387 | } |
2239 | } |
2388 | |
2240 | |
2389 | if (!pl->socket->monitor_spells) |
2241 | if (!pl->ns->monitor_spells) |
2390 | return; |
2242 | return; |
2391 | |
2243 | |
2392 | packet sl; |
2244 | packet sl ("addspell"); |
2393 | |
|
|
2394 | sl << "addspell "; |
|
|
2395 | |
2245 | |
2396 | if (!spell) |
2246 | if (!spell) |
2397 | { |
2247 | { |
2398 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2248 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2399 | { |
2249 | { |
… | |
… | |
2413 | if (spell->type != SPELL) |
2263 | if (spell->type != SPELL) |
2414 | continue; |
2264 | continue; |
2415 | |
2265 | |
2416 | 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)))) |
2417 | { |
2267 | { |
2418 | pl->socket->send_packet (sl); |
2268 | pl->ns->send_packet (sl); |
2419 | |
2269 | |
2420 | sl.reset (); |
2270 | sl.reset (); |
2421 | sl << "addspell "; |
2271 | sl << "addspell "; |
2422 | } |
2272 | } |
2423 | |
2273 | |
… | |
… | |
2437 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2287 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2438 | fatal (0); |
2288 | fatal (0); |
2439 | } |
2289 | } |
2440 | |
2290 | |
2441 | /* finally, we can send the packet */ |
2291 | /* finally, we can send the packet */ |
2442 | pl->socket->send_packet (sl); |
2292 | pl->ns->send_packet (sl); |
2443 | } |
2293 | } |
2444 | |
2294 | |