… | |
… | |
38 | * esrv_map_new starts updating the map |
38 | * esrv_map_new starts updating the map |
39 | * |
39 | * |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
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. |
41 | * if a face has not already been sent to the client, it is sent now. |
42 | * |
42 | * |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
44 | * operations |
|
|
45 | * |
|
|
46 | * esrv_map_doneredraw finishes the map update, and ships across the |
|
|
47 | * map updates. |
|
|
48 | * |
|
|
49 | */ |
43 | */ |
50 | |
44 | |
51 | #include <global.h> |
45 | #include <global.h> |
52 | #include <sproto.h> |
46 | #include <sproto.h> |
53 | |
47 | |
54 | #include <newclient.h> |
|
|
55 | #include <newserver.h> |
|
|
56 | #include <living.h> |
48 | #include <living.h> |
57 | #include <commands.h> |
49 | #include <commands.h> |
58 | |
50 | |
59 | /* This block is basically taken from socket.c - I assume if it works there, |
51 | /* This block is basically taken from socket.c - I assume if it works there, |
60 | * it should work here. |
52 | * it should work here. |
… | |
… | |
63 | #include <sys/time.h> |
55 | #include <sys/time.h> |
64 | #include <sys/socket.h> |
56 | #include <sys/socket.h> |
65 | #include <netinet/in.h> |
57 | #include <netinet/in.h> |
66 | #include <netdb.h> |
58 | #include <netdb.h> |
67 | |
59 | |
68 | #ifdef HAVE_UNISTD_H |
|
|
69 | # include <unistd.h> |
60 | #include <unistd.h> |
70 | #endif |
|
|
71 | |
|
|
72 | #ifdef HAVE_SYS_TIME_H |
|
|
73 | # include <sys/time.h> |
61 | #include <sys/time.h> |
74 | #endif |
|
|
75 | |
62 | |
76 | #include "sounds.h" |
63 | #include "sounds.h" |
77 | |
64 | |
78 | /** |
65 | /** |
79 | * This table translates the attack numbers as used within the |
66 | * This table translates the attack numbers as used within the |
… | |
… | |
96 | -1, /* life stealing */ |
83 | -1, /* life stealing */ |
97 | -1 /* Disease - not fully done yet */ |
84 | -1 /* Disease - not fully done yet */ |
98 | }; |
85 | }; |
99 | |
86 | |
100 | static void |
87 | static void |
101 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
88 | socket_map_scroll (client *ns, int dx, int dy) |
102 | { |
89 | { |
103 | struct Map newmap; |
90 | struct Map newmap; |
104 | int x, y, mx, my; |
91 | int x, y, mx, my; |
105 | |
92 | |
106 | { |
|
|
107 | char buf[MAXSOCKBUF]; |
|
|
108 | |
|
|
109 | sprintf (buf, "map_scroll %d %d", dx, dy); |
93 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
110 | Write_String_To_Socket (ns, buf, strlen (buf)); |
|
|
111 | } |
|
|
112 | |
94 | |
113 | /* If we are using the Map1aCmd, we may in fact send |
95 | /* If we are using the Map1aCmd, we may in fact send |
114 | * head information that is outside the viewable map. |
96 | * head information that is outside the viewable map. |
115 | * So set the mx,my to the max value we want to |
97 | * So set the mx,my to the max value we want to |
116 | * look for. Removed code to do so - it caused extra |
98 | * look for. Removed code to do so - it caused extra |
… | |
… | |
156 | } |
138 | } |
157 | |
139 | |
158 | static void |
140 | static void |
159 | clear_map (player *pl) |
141 | clear_map (player *pl) |
160 | { |
142 | { |
161 | NewSocket & socket = pl->socket; |
|
|
162 | |
|
|
163 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
143 | memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); |
164 | |
144 | |
165 | if (socket.newmapcmd == 1) |
145 | if (pl->socket->newmapcmd == 1) |
166 | Write_String_To_Socket (&socket, "newmap", 6); |
146 | pl->socket->send_packet ("newmap"); |
167 | |
147 | |
168 | socket.update_look = 1; |
148 | pl->socket->floorbox_reset (); |
169 | socket.look_position = 0; |
|
|
170 | } |
149 | } |
171 | |
150 | |
172 | /** check for map change and send new map data */ |
151 | /** check for map change and send new map data */ |
173 | static void |
152 | static void |
174 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
175 | { |
154 | { |
176 | NewSocket & socket = pl->socket; |
155 | client &socket = *pl->socket; |
177 | object *ob = pl->ob; |
156 | object *ob = pl->ob; |
178 | char buf[MAX_BUF]; /* eauugggh */ |
157 | char buf[MAX_BUF]; /* eauugggh */ |
179 | |
158 | |
180 | if (socket.current_map != ob->map) |
159 | if (socket.current_map != ob->map) |
181 | { |
160 | { |
… | |
… | |
202 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
181 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
203 | } |
182 | } |
204 | else |
183 | else |
205 | snprintf (buf, MAX_BUF, "mapinfo current"); |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
206 | |
185 | |
207 | Write_String_To_Socket (&socket, buf, strlen (buf)); |
186 | socket.send_packet (buf); |
208 | } |
187 | } |
209 | } |
188 | } |
210 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
189 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
211 | { |
190 | { |
212 | int dx = ob->x - socket.current_x; |
191 | int dx = ob->x - socket.current_x; |
… | |
… | |
215 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
216 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
195 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
217 | else |
196 | else |
218 | { |
197 | { |
219 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
198 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
220 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
221 | socket.look_position = 0; |
|
|
222 | } |
200 | } |
223 | } |
201 | } |
224 | |
202 | |
225 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
226 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
227 | } |
205 | } |
228 | |
206 | |
|
|
207 | /** |
|
|
208 | * RequestInfo is sort of a meta command. There is some specific |
|
|
209 | * request of information, but we call other functions to provide |
|
|
210 | * that information. |
|
|
211 | */ |
|
|
212 | void |
|
|
213 | RequestInfo (char *buf, int len, client * ns) |
|
|
214 | { |
|
|
215 | char *params = NULL, *cp; |
|
|
216 | |
|
|
217 | /* No match */ |
|
|
218 | char bigbuf[MAX_BUF]; |
|
|
219 | int slen; |
|
|
220 | |
|
|
221 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
222 | * if we don't find a match. |
|
|
223 | */ |
|
|
224 | strcpy (bigbuf, "replyinfo "); |
|
|
225 | slen = strlen (bigbuf); |
|
|
226 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
227 | |
|
|
228 | /* find the first space, make it null, and update the |
|
|
229 | * params pointer. |
|
|
230 | */ |
|
|
231 | for (cp = buf; *cp != '\0'; cp++) |
|
|
232 | if (*cp == ' ') |
|
|
233 | { |
|
|
234 | *cp = '\0'; |
|
|
235 | params = cp + 1; |
|
|
236 | break; |
|
|
237 | } |
|
|
238 | |
|
|
239 | if (!strcmp (buf, "image_info")) |
|
|
240 | send_image_info (ns, params); |
|
|
241 | else if (!strcmp (buf, "image_sums")) |
|
|
242 | send_image_sums (ns, params); |
|
|
243 | else if (!strcmp (buf, "skill_info")) |
|
|
244 | send_skill_info (ns, params); |
|
|
245 | else if (!strcmp (buf, "spell_paths")) |
|
|
246 | send_spell_paths (ns, params); |
|
|
247 | else |
|
|
248 | ns->send_packet (bigbuf, len); |
|
|
249 | } |
|
|
250 | |
229 | void |
251 | void |
230 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (char *buf, int len, player *pl) |
231 | { |
253 | { |
232 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
254 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
255 | } |
|
|
256 | |
|
|
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
233 | } |
261 | } |
234 | |
262 | |
235 | void |
263 | void |
236 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
237 | { |
265 | { |
… | |
… | |
252 | buf += 8; |
280 | buf += 8; |
253 | |
281 | |
254 | // initial map and its origin |
282 | // initial map and its origin |
255 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
256 | sint16 dx, dy; |
284 | sint16 dx, dy; |
257 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
285 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
258 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
286 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
259 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
260 | |
288 | |
261 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
262 | { |
290 | { |
263 | int dir = *buf++; |
291 | int dir = *buf++; |
… | |
… | |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
315 | } |
343 | } |
316 | else |
344 | else |
317 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
318 | |
346 | |
319 | Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); |
347 | pl->socket->send_packet (bigbuf); |
320 | } |
348 | } |
321 | |
349 | |
322 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
323 | void |
351 | void |
324 | SetUp (char *buf, int len, NewSocket * ns) |
352 | SetUp (char *buf, int len, client * ns) |
325 | { |
353 | { |
326 | int s, slen; |
354 | int s, slen; |
327 | char *cmd, *param, cmdback[HUGE_BUF]; |
355 | char *cmd, *param, cmdback[HUGE_BUF]; |
328 | |
356 | |
329 | /* run through the cmds of setup |
357 | /* run through the cmds of setup |
… | |
… | |
331 | * |
359 | * |
332 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
360 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
333 | * The client then must sort this out |
361 | * The client then must sort this out |
334 | */ |
362 | */ |
335 | |
363 | |
336 | LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
364 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
365 | |
337 | strcpy (cmdback, "setup"); |
366 | strcpy (cmdback, "setup"); |
338 | for (s = 0; s < len;) |
367 | for (s = 0; s < len; ) |
339 | { |
368 | { |
340 | |
|
|
341 | cmd = &buf[s]; |
369 | cmd = &buf[s]; |
342 | |
370 | |
343 | /* find the next space, and put a null there */ |
371 | /* find the next space, and put a null there */ |
344 | for (; buf[s] && buf[s] != ' '; s++); |
372 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
373 | ; |
|
|
374 | |
345 | buf[s++] = 0; |
375 | buf[s++] = 0; |
|
|
376 | |
346 | while (buf[s] == ' ') |
377 | while (buf[s] == ' ') |
347 | s++; |
378 | s++; |
348 | |
379 | |
349 | if (s >= len) |
380 | if (s >= len) |
350 | break; |
381 | break; |
351 | |
382 | |
352 | param = &buf[s]; |
383 | param = &buf[s]; |
353 | |
384 | |
354 | for (; buf[s] && buf[s] != ' '; s++); |
385 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
386 | ; |
|
|
387 | |
355 | buf[s++] = 0; |
388 | buf[s++] = 0; |
|
|
389 | |
356 | while (buf[s] == ' ') |
390 | while (buf[s] == ' ') |
357 | s++; |
391 | s++; |
358 | |
392 | |
359 | slen = strlen (cmdback); |
393 | slen = strlen (cmdback); |
360 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
394 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
… | |
… | |
521 | * report a failure to the client. |
555 | * report a failure to the client. |
522 | */ |
556 | */ |
523 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
557 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
524 | } |
558 | } |
525 | } /* for processing all the setup commands */ |
559 | } /* for processing all the setup commands */ |
|
|
560 | |
526 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
561 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
527 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
562 | ns->send_packet (cmdback); |
528 | } |
563 | } |
529 | |
564 | |
530 | /** |
565 | /** |
531 | * The client has requested to be added to the game. |
566 | * The client has requested to be added to the game. |
532 | * This is what takes care of it. We tell the client how things worked out. |
567 | * This is what takes care of it. We tell the client how things worked out. |
533 | * I am not sure if this file is the best place for this function. however, |
568 | * I am not sure if this file is the best place for this function. however, |
534 | * it either has to be here or init_sockets needs to be exported. |
569 | * it either has to be here or init_sockets needs to be exported. |
535 | */ |
570 | */ |
536 | void |
571 | void |
537 | AddMeCmd (char *buf, int len, NewSocket * ns) |
572 | AddMeCmd (char *buf, int len, client * ns) |
538 | { |
573 | { |
539 | Settings oldsettings; |
|
|
540 | |
|
|
541 | oldsettings = settings; |
|
|
542 | if (ns->status != Ns_Add || add_player (ns)) |
574 | if (ns->status != Ns_Add || add_player (ns)) |
543 | { |
575 | ns->send_packet ("addme_failed"); |
544 | Write_String_To_Socket (ns, "addme_failed", 12); |
|
|
545 | } |
|
|
546 | else |
576 | else |
547 | { |
577 | ns->send_packet ("addme_success"); |
548 | /* Basically, the add_player copies the socket structure into |
|
|
549 | * the player structure, so this one (which is from init_sockets) |
|
|
550 | * is not needed anymore. The write below should still work, as the |
|
|
551 | * stuff in ns is still relevant. |
|
|
552 | */ |
|
|
553 | Write_String_To_Socket (ns, "addme_success", 13); |
|
|
554 | socket_info.nconns--; |
|
|
555 | ns->status = Ns_Avail; |
|
|
556 | } |
|
|
557 | settings = oldsettings; |
|
|
558 | } |
578 | } |
559 | |
579 | |
560 | /** Reply to ExtendedInfos command */ |
580 | /** Reply to ExtendedInfos command */ |
561 | void |
581 | void |
562 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
582 | ToggleExtendedInfos (char *buf, int len, client * ns) |
563 | { |
583 | { |
564 | char cmdback[MAX_BUF]; |
584 | char cmdback[MAX_BUF]; |
565 | char command[50]; |
585 | char command[50]; |
566 | int info, nextinfo; |
586 | int info, nextinfo; |
567 | |
587 | |
… | |
… | |
605 | { |
625 | { |
606 | strcat (cmdback, " "); |
626 | strcat (cmdback, " "); |
607 | strcat (cmdback, "smoothing"); |
627 | strcat (cmdback, "smoothing"); |
608 | } |
628 | } |
609 | |
629 | |
610 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
630 | ns->send_packet (cmdback); |
611 | } |
631 | } |
612 | |
632 | |
613 | /* |
633 | /* |
614 | #define MSG_TYPE_BOOK 1 |
634 | #define MSG_TYPE_BOOK 1 |
615 | #define MSG_TYPE_CARD 2 |
635 | #define MSG_TYPE_CARD 2 |
… | |
… | |
618 | #define MSG_TYPE_MONUMENT 5 |
638 | #define MSG_TYPE_MONUMENT 5 |
619 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
639 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
620 | |
640 | |
621 | /** Reply to ExtendedInfos command */ |
641 | /** Reply to ExtendedInfos command */ |
622 | void |
642 | void |
623 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
643 | ToggleExtendedText (char *buf, int len, client * ns) |
624 | { |
644 | { |
625 | char cmdback[MAX_BUF]; |
645 | char cmdback[MAX_BUF]; |
626 | char temp[10]; |
646 | char temp[10]; |
627 | char command[50]; |
647 | char command[50]; |
628 | int info, nextinfo, i, flag; |
648 | int info, nextinfo, i, flag; |
… | |
… | |
668 | strcat (cmdback, " "); |
688 | strcat (cmdback, " "); |
669 | snprintf (temp, sizeof (temp), "%d", i); |
689 | snprintf (temp, sizeof (temp), "%d", i); |
670 | strcat (cmdback, temp); |
690 | strcat (cmdback, temp); |
671 | } |
691 | } |
672 | |
692 | |
673 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
693 | ns->send_packet (cmdback); |
674 | } |
694 | } |
675 | |
695 | |
676 | /** |
696 | /** |
677 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
697 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
678 | * Basically, it makes no sense to wait for the client to request a |
698 | * Basically, it makes no sense to wait for the client to request a |
679 | * a piece of data from us that we know the client wants. So |
699 | * a piece of data from us that we know the client wants. So |
680 | * if we know the client wants it, might as well push it to the |
700 | * if we know the client wants it, might as well push it to the |
681 | * client. |
701 | * client. |
682 | */ |
702 | */ |
683 | static void |
703 | static void |
684 | SendSmooth (NewSocket * ns, uint16 face) |
704 | SendSmooth (client *ns, uint16 face) |
685 | { |
705 | { |
686 | uint16 smoothface; |
706 | uint16 smoothface; |
687 | |
707 | |
688 | /* If we can't find a face, return and set it so we won't try to send this |
708 | /* If we can't find a face, return and set it so we won't try to send this |
689 | * again. |
709 | * again. |
… | |
… | |
699 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
719 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
700 | esrv_send_face (ns, smoothface, 0); |
720 | esrv_send_face (ns, smoothface, 0); |
701 | |
721 | |
702 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
722 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
703 | |
723 | |
704 | SockList sl (MAXSOCKBUF); |
724 | packet sl ("smooth"); |
705 | |
725 | |
706 | sl << "smooth " |
|
|
707 | << uint16 (face) |
726 | sl << uint16 (face) |
708 | << uint16 (smoothface); |
727 | << uint16 (smoothface); |
709 | |
728 | |
710 | Send_With_Handling (ns, &sl); |
729 | ns->send_packet (sl); |
711 | sl.free (); |
|
|
712 | } |
730 | } |
713 | |
731 | |
714 | /** |
732 | /** |
715 | * Tells client the picture it has to use |
733 | * Tells client the picture it has to use |
716 | * to smooth a picture number given as argument. |
734 | * to smooth a picture number given as argument. |
717 | */ |
735 | */ |
718 | void |
736 | void |
719 | AskSmooth (char *buf, int len, NewSocket * ns) |
737 | AskSmooth (char *buf, int len, client *ns) |
720 | { |
738 | { |
721 | uint16 facenbr; |
739 | SendSmooth (ns, atoi (buf)); |
722 | |
|
|
723 | facenbr = atoi (buf); |
|
|
724 | SendSmooth (ns, facenbr); |
|
|
725 | } |
740 | } |
726 | |
741 | |
727 | /** |
742 | /** |
728 | * This handles the general commands from the client (ie, north, fire, cast, |
743 | * This handles the general commands from the client (ie, north, fire, cast, |
729 | * etc.) |
744 | * etc.) |
730 | */ |
745 | */ |
731 | void |
746 | void |
732 | PlayerCmd (char *buf, int len, player *pl) |
747 | PlayerCmd (char *buf, int len, player *pl) |
733 | { |
748 | { |
734 | |
|
|
735 | /* The following should never happen with a proper or honest client. |
|
|
736 | * Therefore, the error message doesn't have to be too clear - if |
|
|
737 | * someone is playing with a hacked/non working client, this gives them |
|
|
738 | * an idea of the problem, but they deserve what they get |
|
|
739 | */ |
|
|
740 | if (pl->state != ST_PLAYING) |
|
|
741 | { |
|
|
742 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
743 | return; |
|
|
744 | } |
|
|
745 | /* Check if there is a count. In theory, a zero count could also be |
749 | /* Check if there is a count. In theory, a zero count could also be |
746 | * sent, so check for that also. |
750 | * sent, so check for that also. |
747 | */ |
751 | */ |
748 | if (atoi (buf) || buf[0] == '0') |
752 | if (atoi (buf) || buf[0] == '0') |
749 | { |
753 | { |
750 | pl->count = atoi ((char *) buf); |
754 | pl->count = atoi ((char *) buf); |
|
|
755 | |
751 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
756 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
752 | if (!buf) |
757 | if (!buf) |
753 | { |
|
|
754 | #ifdef ESRV_DEBUG |
|
|
755 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
756 | #endif |
|
|
757 | return; |
758 | return; |
758 | } |
759 | |
759 | buf++; |
760 | buf++; |
760 | } |
761 | } |
761 | /* This should not happen anymore. */ |
762 | |
762 | if (pl->ob->speed_left < -1.0) |
|
|
763 | { |
|
|
764 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
765 | } |
|
|
766 | /* In c_new.c */ |
|
|
767 | execute_newserver_command (pl->ob, (char *) buf); |
763 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
764 | |
768 | /* Perhaps something better should be done with a left over count. |
765 | /* Perhaps something better should be done with a left over count. |
769 | * Cleaning up the input should probably be done first - all actions |
766 | * Cleaning up the input should probably be done first - all actions |
770 | * for the command that issued the count should be done before any other |
767 | * for the command that issued the count should be done before any other |
771 | * commands. |
768 | * commands. |
772 | */ |
769 | */ |
773 | |
|
|
774 | pl->count = 0; |
770 | pl->count = 0; |
775 | |
|
|
776 | } |
771 | } |
777 | |
772 | |
778 | |
773 | |
779 | /** |
774 | /** |
780 | * This handles the general commands from the client (ie, north, fire, cast, |
775 | * This handles the general commands from the client (ie, north, fire, cast, |
781 | * etc.). It is a lot like PlayerCmd above, but is called with the |
776 | * etc.). It is a lot like PlayerCmd above, but is called with the |
782 | * 'ncom' method which gives more information back to the client so it |
777 | * 'ncom' method which gives more information back to the client so it |
783 | * can throttle. |
778 | * can throttle. |
784 | */ |
779 | */ |
785 | void |
780 | void |
786 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
781 | NewPlayerCmd (char *buf, int len, player *pl) |
787 | { |
782 | { |
788 | int time, repeat; |
|
|
789 | char command[MAX_BUF]; |
|
|
790 | short packet; |
|
|
791 | |
|
|
792 | if (len < 7) |
783 | if (len <= 6) |
793 | { |
784 | { |
794 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
785 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
795 | return; |
786 | return; |
796 | } |
787 | } |
797 | |
788 | |
798 | packet = net_uint16 (buf); |
789 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
799 | repeat = net_uint32 (buf + 2); |
790 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
800 | |
791 | |
801 | /* -1 is special - no repeat, but don't update */ |
792 | /* -1 is special - no repeat, but don't update */ |
802 | if (repeat != -1) |
793 | if (repeat != -1) |
803 | pl->count = repeat; |
794 | pl->count = repeat; |
804 | |
795 | |
805 | if ((len - 4) >= MAX_BUF) |
796 | buf += 6; //len -= 6; |
806 | len = MAX_BUF - 5; |
|
|
807 | |
797 | |
808 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
809 | command[len - 4] = '\0'; |
|
|
810 | |
|
|
811 | /* The following should never happen with a proper or honest client. |
|
|
812 | * Therefore, the error message doesn't have to be too clear - if |
|
|
813 | * someone is playing with a hacked/non working client, this gives them |
|
|
814 | * an idea of the problem, but they deserve what they get |
|
|
815 | */ |
|
|
816 | if (pl->state != ST_PLAYING) |
|
|
817 | { |
|
|
818 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
819 | return; |
|
|
820 | } |
|
|
821 | |
|
|
822 | /* This should not happen anymore. */ |
|
|
823 | if (pl->ob->speed_left < -1.0) |
|
|
824 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
825 | |
|
|
826 | /* In c_new.c */ |
|
|
827 | execute_newserver_command (pl->ob, (char *) command); |
798 | execute_newserver_command (pl->ob, buf); |
|
|
799 | |
828 | /* Perhaps something better should be done with a left over count. |
800 | /* Perhaps something better should be done with a left over count. |
829 | * Cleaning up the input should probably be done first - all actions |
801 | * Cleaning up the input should probably be done first - all actions |
830 | * for the command that issued the count should be done before any other |
802 | * for the command that issued the count should be done before any other |
831 | * commands. |
803 | * commands. |
832 | */ |
804 | */ |
833 | pl->count = 0; |
805 | pl->count = 0; |
834 | |
806 | |
|
|
807 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
835 | if (FABS (pl->ob->speed) < 0.001) |
808 | int time = FABS (pl->ob->speed) < 0.001 |
836 | time = MAX_TIME * 100; |
809 | ? time = MAX_TIME * 100 |
837 | else |
|
|
838 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
810 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
839 | |
811 | |
840 | /* Send confirmation of command execution now */ |
812 | /* Send confirmation of command execution now */ |
841 | |
813 | packet sl ("comc"); |
842 | SockList sl (MAXSOCKBUF); |
|
|
843 | sl << "comc " << uint16 (packet) << uint32 (time); |
814 | sl << uint16 (cmdid) << uint32 (time); |
844 | Send_With_Handling (&pl->socket, &sl); |
815 | pl->socket->send_packet (sl); |
845 | sl.free (); |
|
|
846 | } |
816 | } |
847 | |
817 | |
848 | |
818 | |
849 | /** This is a reply to a previous query. */ |
819 | /** This is a reply to a previous query. */ |
850 | void |
820 | void |
851 | ReplyCmd (char *buf, int len, player *pl) |
821 | ReplyCmd (char *buf, int len, player *pl) |
852 | { |
822 | { |
853 | /* This is to synthesize how the data would be stored if it |
823 | /* This is to synthesize how the data would be stored if it |
854 | * was normally entered. A bit of a hack, and should be cleaned up |
824 | * was normally entered. A bit of a hack, and should be cleaned up |
855 | * once all the X11 code is removed from the server. |
825 | * once all the X11 code is removed from the server. |
856 | * |
826 | * |
857 | * We pass 13 to many of the functions because this way they |
827 | * We pass 13 to many of the functions because this way they |
858 | * think it was the carriage return that was entered, and the |
828 | * think it was the carriage return that was entered, and the |
859 | * function then does not try to do additional input. |
829 | * function then does not try to do additional input. |
… | |
… | |
862 | |
832 | |
863 | /* this avoids any hacking here */ |
833 | /* this avoids any hacking here */ |
864 | |
834 | |
865 | switch (pl->state) |
835 | switch (pl->state) |
866 | { |
836 | { |
867 | case ST_PLAYING: |
837 | case ST_PLAYING: |
868 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
838 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
869 | break; |
839 | break; |
870 | |
840 | |
871 | case ST_PLAY_AGAIN: |
841 | case ST_PLAY_AGAIN: |
872 | /* We can check this for return value (2==quit). Maybe we |
842 | /* We can check this for return value (2==quit). Maybe we |
873 | * should, and do something appropriate? |
843 | * should, and do something appropriate? |
874 | */ |
844 | */ |
875 | receive_play_again (pl->ob, buf[0]); |
845 | receive_play_again (pl->ob, buf[0]); |
876 | break; |
846 | break; |
877 | |
847 | |
878 | case ST_ROLL_STAT: |
848 | case ST_ROLL_STAT: |
879 | key_roll_stat (pl->ob, buf[0]); |
849 | key_roll_stat (pl->ob, buf[0]); |
880 | break; |
850 | break; |
881 | |
851 | |
882 | case ST_CHANGE_CLASS: |
852 | case ST_CHANGE_CLASS: |
883 | |
853 | |
884 | key_change_class (pl->ob, buf[0]); |
854 | key_change_class (pl->ob, buf[0]); |
885 | break; |
855 | break; |
886 | |
856 | |
887 | case ST_CONFIRM_QUIT: |
857 | case ST_CONFIRM_QUIT: |
888 | key_confirm_quit (pl->ob, buf[0]); |
858 | key_confirm_quit (pl->ob, buf[0]); |
889 | break; |
859 | break; |
890 | |
860 | |
891 | case ST_CONFIGURE: |
861 | case ST_CONFIGURE: |
892 | LOG (llevError, "In client input handling, but into configure state\n"); |
862 | LOG (llevError, "In client input handling, but into configure state\n"); |
893 | pl->state = ST_PLAYING; |
863 | pl->state = ST_PLAYING; |
894 | break; |
864 | break; |
895 | |
865 | |
896 | case ST_GET_NAME: |
866 | case ST_GET_NAME: |
897 | receive_player_name (pl->ob, 13); |
867 | receive_player_name (pl->ob, 13); |
898 | break; |
868 | break; |
899 | |
869 | |
900 | case ST_GET_PASSWORD: |
870 | case ST_GET_PASSWORD: |
901 | case ST_CONFIRM_PASSWORD: |
871 | case ST_CONFIRM_PASSWORD: |
902 | receive_player_password (pl->ob, 13); |
872 | receive_player_password (pl->ob, 13); |
903 | break; |
873 | break; |
904 | |
874 | |
905 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
875 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
906 | receive_party_password (pl->ob, 13); |
876 | receive_party_password (pl->ob, 13); |
907 | break; |
877 | break; |
908 | |
878 | |
909 | default: |
879 | default: |
910 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
880 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
911 | } |
881 | } |
912 | } |
882 | } |
913 | |
883 | |
914 | /** |
884 | /** |
915 | * Client tells its version. If there is a mismatch, we close the |
885 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
917 | * something older than the server. If we assume the client will be |
887 | * something older than the server. If we assume the client will be |
918 | * backwards compatible, having it be a later version should not be a |
888 | * backwards compatible, having it be a later version should not be a |
919 | * problem. |
889 | * problem. |
920 | */ |
890 | */ |
921 | void |
891 | void |
922 | VersionCmd (char *buf, int len, NewSocket * ns) |
892 | VersionCmd (char *buf, int len, client * ns) |
923 | { |
893 | { |
924 | char *cp; |
|
|
925 | char version_warning[256]; |
|
|
926 | |
|
|
927 | if (!buf) |
894 | if (!buf) |
928 | { |
895 | { |
929 | LOG (llevError, "CS: received corrupted version command\n"); |
896 | LOG (llevError, "CS: received corrupted version command\n"); |
930 | return; |
897 | return; |
931 | } |
898 | } |
932 | |
899 | |
933 | ns->cs_version = atoi (buf); |
900 | ns->cs_version = atoi (buf); |
934 | ns->sc_version = ns->cs_version; |
901 | ns->sc_version = ns->cs_version; |
|
|
902 | |
|
|
903 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
904 | |
|
|
905 | |
|
|
906 | //TODO: should log here just for statistics |
|
|
907 | |
935 | if (VERSION_CS != ns->cs_version) |
908 | //if (VERSION_CS != ns->cs_version) |
936 | { |
909 | // unchecked; |
937 | #ifdef ESRV_DEBUG |
910 | |
938 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
939 | #endif |
|
|
940 | } |
|
|
941 | cp = strchr (buf + 1, ' '); |
911 | char *cp = strchr (buf + 1, ' '); |
942 | if (!cp) |
912 | if (!cp) |
943 | return; |
913 | return; |
|
|
914 | |
944 | ns->sc_version = atoi (cp); |
915 | ns->sc_version = atoi (cp); |
|
|
916 | |
945 | if (VERSION_SC != ns->sc_version) |
917 | //if (VERSION_SC != ns->sc_version) |
946 | { |
918 | // unchecked; |
947 | #ifdef ESRV_DEBUG |
919 | |
948 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
949 | #endif |
|
|
950 | } |
|
|
951 | cp = strchr (cp + 1, ' '); |
920 | cp = strchr (cp + 1, ' '); |
|
|
921 | |
952 | if (cp) |
922 | if (cp) |
953 | { |
923 | { |
954 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
924 | assign (ns->version, cp + 1); |
955 | |
925 | |
956 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
957 | |
|
|
958 | /* This is first implementation - i skip all beta DX clients with it |
|
|
959 | * Add later stuff here for other clients |
|
|
960 | */ |
|
|
961 | |
|
|
962 | /* these are old dxclients */ |
|
|
963 | /* Version 1024 added support for singular + plural name values - |
|
|
964 | * requiing this minimal value reduces complexity of that code, and it |
|
|
965 | * has been around for a long time. |
|
|
966 | */ |
|
|
967 | if (ns->sc_version < 1026) |
926 | if (ns->sc_version < 1026) |
968 | { |
927 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
969 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
970 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
928 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
971 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
|
|
972 | } |
|
|
973 | |
|
|
974 | } |
929 | } |
975 | } |
930 | } |
976 | |
931 | |
977 | /** sound related functions. */ |
932 | /** sound related functions. */ |
978 | |
|
|
979 | void |
933 | void |
980 | SetSound (char *buf, int len, NewSocket * ns) |
934 | SetSound (char *buf, int len, client * ns) |
981 | { |
935 | { |
982 | ns->sound = atoi (buf); |
936 | ns->sound = atoi (buf); |
983 | } |
937 | } |
984 | |
938 | |
985 | /** client wants the map resent */ |
939 | /** client wants the map resent */ |
986 | |
940 | |
987 | void |
941 | void |
988 | MapRedrawCmd (char *buf, int len, player *pl) |
942 | MapRedrawCmd (char *buf, int len, player *pl) |
989 | { |
943 | { |
990 | |
|
|
991 | /* This function is currently disabled; just clearing the map state results in |
944 | /* This function is currently disabled; just clearing the map state results in |
992 | * display errors. It should clear the cache and send a newmap command. |
945 | * display errors. It should clear the cache and send a newmap command. |
993 | * Unfortunately this solution does not work because some client versions send |
946 | * Unfortunately this solution does not work because some client versions send |
994 | * a mapredraw command after receiving a newmap command. |
947 | * a mapredraw command after receiving a newmap command. |
995 | */ |
948 | */ |
996 | #if 0 |
|
|
997 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
998 | * clear the "cache" |
|
|
999 | */ |
|
|
1000 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
|
|
1001 | draw_client_map (pl->ob); |
|
|
1002 | #endif |
|
|
1003 | } |
949 | } |
1004 | |
950 | |
1005 | /** |
951 | /** |
1006 | * Moves an object (typically, container to inventory). |
952 | * Moves an object (typically, container to inventory). |
1007 | * syntax is: move (to) (tag) (nrof) |
953 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1010 | MoveCmd (char *buf, int len, player *pl) |
956 | MoveCmd (char *buf, int len, player *pl) |
1011 | { |
957 | { |
1012 | int vals[3], i; |
958 | int vals[3], i; |
1013 | |
959 | |
1014 | /* A little funky here. We only cycle for 2 records, because |
960 | /* A little funky here. We only cycle for 2 records, because |
1015 | * we obviously am not going to find a space after the third |
961 | * we obviously are not going to find a space after the third |
1016 | * record. Perhaps we should just replace this with a |
962 | * record. Perhaps we should just replace this with a |
1017 | * sscanf? |
963 | * sscanf? |
1018 | */ |
964 | */ |
1019 | for (i = 0; i < 2; i++) |
965 | for (i = 0; i < 2; i++) |
1020 | { |
966 | { |
1021 | vals[i] = atoi (buf); |
967 | vals[i] = atoi (buf); |
|
|
968 | |
1022 | if (!(buf = strchr (buf, ' '))) |
969 | if (!(buf = strchr (buf, ' '))) |
1023 | { |
970 | { |
1024 | LOG (llevError, "Incomplete move command: %s\n", buf); |
971 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1025 | return; |
972 | return; |
1026 | } |
973 | } |
|
|
974 | |
1027 | buf++; |
975 | buf++; |
1028 | } |
976 | } |
|
|
977 | |
1029 | vals[2] = atoi (buf); |
978 | vals[2] = atoi (buf); |
1030 | |
979 | |
1031 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
980 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1032 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
981 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1033 | } |
982 | } |
1034 | |
|
|
1035 | |
|
|
1036 | |
983 | |
1037 | /****************************************************************************** |
984 | /****************************************************************************** |
1038 | * |
985 | * |
1039 | * Start of commands the server sends to the client. |
986 | * Start of commands the server sends to the client. |
1040 | * |
987 | * |
… | |
… | |
1043 | /** |
990 | /** |
1044 | * Asks the client to query the user. This way, the client knows |
991 | * Asks the client to query the user. This way, the client knows |
1045 | * it needs to send something back (vs just printing out a message) |
992 | * it needs to send something back (vs just printing out a message) |
1046 | */ |
993 | */ |
1047 | void |
994 | void |
1048 | send_query (NewSocket * ns, uint8 flags, char *text) |
995 | send_query (client *ns, uint8 flags, char *text) |
1049 | { |
996 | { |
1050 | char buf[MAX_BUF]; |
|
|
1051 | |
|
|
1052 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
997 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1053 | Write_String_To_Socket (ns, buf, strlen (buf)); |
|
|
1054 | } |
998 | } |
1055 | |
999 | |
1056 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1000 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1057 | Old = New; \ |
1001 | Old = New; \ |
1058 | sl << uint8 (Type) << uint64 (New); \ |
1002 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1088 | esrv_update_stats (player *pl) |
1032 | esrv_update_stats (player *pl) |
1089 | { |
1033 | { |
1090 | char buf[MAX_BUF]; |
1034 | char buf[MAX_BUF]; |
1091 | uint16 flags; |
1035 | uint16 flags; |
1092 | |
1036 | |
1093 | SockList sl (MAXSOCKBUF); |
1037 | packet sl ("stats"); |
1094 | sl << "stats "; |
|
|
1095 | |
1038 | |
1096 | if (pl->ob != NULL) |
1039 | if (pl->ob) |
1097 | { |
1040 | { |
1098 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1041 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1099 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1042 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1100 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1043 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1101 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1044 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
… | |
… | |
1108 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1051 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1109 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1052 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1110 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1053 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1111 | } |
1054 | } |
1112 | |
1055 | |
1113 | if (pl->socket.exp64) |
1056 | if (pl->socket->exp64) |
1114 | { |
|
|
1115 | uint8 s; |
|
|
1116 | |
|
|
1117 | for (s = 0; s < NUM_SKILLS; s++) |
1057 | for (int s = 0; s < NUM_SKILLS; s++) |
1118 | { |
|
|
1119 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1058 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1120 | { |
1059 | { |
1121 | /* Always send along the level if exp changes. This is only |
1060 | /* Always send along the level if exp changes. This is only |
1122 | * 1 extra byte, but keeps processing simpler. |
1061 | * 1 extra byte, but keeps processing simpler. |
1123 | */ |
1062 | */ |
1124 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1063 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1125 | << uint8 (pl->last_skill_ob[s]->level) |
1064 | << uint8 (pl->last_skill_ob[s]->level) |
1126 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1065 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1127 | |
1066 | |
1128 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1067 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1129 | } |
1068 | } |
1130 | } |
|
|
1131 | } |
|
|
1132 | |
1069 | |
1133 | if (pl->socket.exp64) |
1070 | if (pl->socket->exp64) |
1134 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1071 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1135 | else |
1072 | else |
1136 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1073 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1137 | |
1074 | |
1138 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1075 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1151 | if (pl->run_on) |
1088 | if (pl->run_on) |
1152 | flags |= SF_RUNON; |
1089 | flags |= SF_RUNON; |
1153 | |
1090 | |
1154 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1091 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1155 | |
1092 | |
1156 | if (pl->socket.sc_version < 1025) |
1093 | if (pl->socket->sc_version < 1025) |
1157 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1094 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1158 | else |
1095 | else |
1159 | { |
|
|
1160 | int i; |
|
|
1161 | |
|
|
1162 | for (i = 0; i < NROFATTACKS; i++) |
1096 | for (int i = 0; i < NROFATTACKS; i++) |
1163 | { |
1097 | { |
1164 | /* Skip ones we won't send */ |
1098 | /* Skip ones we won't send */ |
1165 | if (atnr_cs_stat[i] == -1) |
1099 | if (atnr_cs_stat[i] == -1) |
1166 | continue; |
1100 | continue; |
1167 | |
1101 | |
1168 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1102 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1169 | } |
1103 | } |
1170 | } |
|
|
1171 | |
1104 | |
1172 | if (pl->socket.monitor_spells) |
1105 | if (pl->socket->monitor_spells) |
1173 | { |
1106 | { |
1174 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1107 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1175 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1108 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1176 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1109 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1177 | } |
1110 | } |
1178 | |
1111 | |
1179 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1112 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1180 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1113 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1181 | set_title (pl->ob, buf); |
1114 | set_title (pl->ob, buf); |
1182 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1115 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1183 | |
1116 | |
1184 | /* Only send it away if we have some actual data */ |
1117 | /* Only send it away if we have some actual data */ |
1185 | if (sl.len > 6) |
1118 | if (sl.length () > 6) |
1186 | { |
1119 | pl->socket->send_packet (sl); |
1187 | #ifdef ESRV_DEBUG |
|
|
1188 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
1189 | #endif |
|
|
1190 | Send_With_Handling (&pl->socket, &sl); |
|
|
1191 | } |
|
|
1192 | |
|
|
1193 | sl.free (); |
|
|
1194 | } |
1120 | } |
1195 | |
1121 | |
1196 | /** |
1122 | /** |
1197 | * Tells the client that here is a player it should start using. |
1123 | * Tells the client that here is a player it should start using. |
1198 | */ |
1124 | */ |
1199 | void |
1125 | void |
1200 | esrv_new_player (player *pl, uint32 weight) |
1126 | esrv_new_player (player *pl, uint32 weight) |
1201 | { |
1127 | { |
1202 | pl->last_weight = weight; |
1128 | pl->last_weight = weight; |
1203 | |
1129 | |
1204 | SockList sl (MAXSOCKBUF); |
1130 | packet sl ("player"); |
1205 | sl << "player "; |
|
|
1206 | |
1131 | |
1207 | sl << uint32 (pl->ob->count) |
1132 | sl << uint32 (pl->ob->count) |
1208 | << uint32 (weight) |
1133 | << uint32 (weight) |
1209 | << uint32 (pl->ob->face->number) |
1134 | << uint32 (pl->ob->face->number) |
1210 | << data8 (pl->ob->name); |
1135 | << data8 (pl->ob->name); |
1211 | |
1136 | |
1212 | Send_With_Handling (&pl->socket, &sl); |
1137 | pl->socket->send_packet (sl); |
1213 | sl.free (); |
|
|
1214 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1138 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1215 | } |
1139 | } |
1216 | |
1140 | |
1217 | /** |
1141 | /** |
1218 | * Need to send an animation sequence to the client. |
1142 | * Need to send an animation sequence to the client. |
… | |
… | |
1220 | * sent them the face yet (this can become quite costly in terms of |
1144 | * sent them the face yet (this can become quite costly in terms of |
1221 | * how much we are sending - on the other hand, this should only happen |
1145 | * how much we are sending - on the other hand, this should only happen |
1222 | * when the player logs in and picks stuff up. |
1146 | * when the player logs in and picks stuff up. |
1223 | */ |
1147 | */ |
1224 | void |
1148 | void |
1225 | esrv_send_animation (NewSocket * ns, short anim_num) |
1149 | esrv_send_animation (client * ns, short anim_num) |
1226 | { |
1150 | { |
1227 | int i; |
|
|
1228 | |
|
|
1229 | /* Do some checking on the anim_num we got. Note that the animations |
1151 | /* Do some checking on the anim_num we got. Note that the animations |
1230 | * are added in contigous order, so if the number is in the valid |
1152 | * are added in contigous order, so if the number is in the valid |
1231 | * range, it must be a valid animation. |
1153 | * range, it must be a valid animation. |
1232 | */ |
1154 | */ |
1233 | if (anim_num < 0 || anim_num > num_animations) |
1155 | if (anim_num < 0 || anim_num > num_animations) |
1234 | { |
1156 | { |
1235 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1157 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1236 | return; |
1158 | return; |
1237 | } |
1159 | } |
1238 | |
1160 | |
1239 | SockList sl (MAXSOCKBUF); |
1161 | packet sl ("anim"); |
1240 | |
1162 | |
1241 | sl << "anim " |
|
|
1242 | << uint16 (anim_num) |
1163 | sl << uint16 (anim_num) |
1243 | << uint16 (0); /* flags - not used right now */ |
1164 | << uint16 (0); /* flags - not used right now */ |
1244 | |
1165 | |
1245 | /* Build up the list of faces. Also, send any information (ie, the |
1166 | /* Build up the list of faces. Also, send any information (ie, the |
1246 | * the face itself) down to the client. |
1167 | * the face itself) down to the client. |
1247 | */ |
1168 | */ |
1248 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1169 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1249 | { |
1170 | { |
1250 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1171 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1251 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1172 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1173 | |
1252 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1174 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1253 | } |
1175 | } |
1254 | |
1176 | |
1255 | Send_With_Handling (ns, &sl); |
1177 | ns->send_packet (sl); |
1256 | sl.free (); |
|
|
1257 | |
1178 | |
1258 | ns->anims_sent[anim_num] = 1; |
1179 | ns->anims_sent[anim_num] = 1; |
1259 | } |
1180 | } |
1260 | |
1181 | |
1261 | |
1182 | |
… | |
… | |
1268 | /** |
1189 | /** |
1269 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1190 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1270 | * the face yet, we will also send it. |
1191 | * the face yet, we will also send it. |
1271 | */ |
1192 | */ |
1272 | static void |
1193 | static void |
1273 | esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) |
1194 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1274 | { |
1195 | { |
1275 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1196 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1276 | { |
1197 | { |
|
|
1198 | //TODO: one or the other, can't both have abort and return, verify and act |
1277 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1199 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1278 | return; |
1200 | return; |
1279 | abort (); |
1201 | abort (); |
1280 | } |
1202 | } |
1281 | |
1203 | |
… | |
… | |
1283 | newmap->cells[x][y].count++; |
1205 | newmap->cells[x][y].count++; |
1284 | |
1206 | |
1285 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1207 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1286 | esrv_send_face (ns, face_num, 0); |
1208 | esrv_send_face (ns, face_num, 0); |
1287 | } |
1209 | } |
1288 | |
|
|
1289 | struct LayerCell |
|
|
1290 | { |
|
|
1291 | uint16 xy; |
|
|
1292 | short face; |
|
|
1293 | }; |
|
|
1294 | |
|
|
1295 | struct MapLayer |
|
|
1296 | { |
|
|
1297 | int count; |
|
|
1298 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1299 | }; |
|
|
1300 | |
|
|
1301 | /** Checkes if map cells have changed */ |
|
|
1302 | static int |
|
|
1303 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
|
|
1304 | { |
|
|
1305 | int k; |
|
|
1306 | |
|
|
1307 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1308 | return 1; |
|
|
1309 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1310 | { |
|
|
1311 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1312 | { |
|
|
1313 | return 1; |
|
|
1314 | } |
|
|
1315 | } |
|
|
1316 | return 0; |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | /** |
|
|
1320 | * Basically, what this does is pack the data into layers. |
|
|
1321 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1322 | * this data into. we return the end of the data. layers is |
|
|
1323 | * how many layers of data we should back. |
|
|
1324 | */ |
|
|
1325 | static uint8 * |
|
|
1326 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1327 | { |
|
|
1328 | int x, y, k; |
|
|
1329 | int face; |
|
|
1330 | unsigned char *fcur; |
|
|
1331 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1332 | |
|
|
1333 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1334 | layers[k].count = 0; |
|
|
1335 | fcur = cur; |
|
|
1336 | for (x = 0; x < ns->mapx; x++) |
|
|
1337 | { |
|
|
1338 | for (y = 0; y < ns->mapy; y++) |
|
|
1339 | { |
|
|
1340 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1341 | continue; |
|
|
1342 | if (newmap->cells[x][y].count == 0) |
|
|
1343 | { |
|
|
1344 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1345 | cur++; |
|
|
1346 | continue; |
|
|
1347 | } |
|
|
1348 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1349 | { |
|
|
1350 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1351 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1352 | layers[k].count++; |
|
|
1353 | } |
|
|
1354 | } |
|
|
1355 | } |
|
|
1356 | /* If no data, return now. */ |
|
|
1357 | if (fcur == cur && layers[0].count == 0) |
|
|
1358 | return cur; |
|
|
1359 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1360 | cur++; |
|
|
1361 | /* First pack by layers. */ |
|
|
1362 | for (k = 0; k < numlayers; k++) |
|
|
1363 | { |
|
|
1364 | if (layers[k].count == 0) |
|
|
1365 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1366 | have anything in it either */ |
|
|
1367 | /* Pack by entries in thie layer */ |
|
|
1368 | for (x = 0; x < layers[k].count;) |
|
|
1369 | { |
|
|
1370 | fcur = cur; |
|
|
1371 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1372 | cur++; |
|
|
1373 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1374 | cur++; |
|
|
1375 | face = layers[k].lcells[x].face; |
|
|
1376 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1377 | for (y = x; y < layers[k].count; y++) |
|
|
1378 | { |
|
|
1379 | if (layers[k].lcells[y].face == face) |
|
|
1380 | { |
|
|
1381 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1382 | cur++; |
|
|
1383 | layers[k].lcells[y].face = -1; |
|
|
1384 | } |
|
|
1385 | } |
|
|
1386 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1387 | /* forward over the now redundant data */ |
|
|
1388 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1389 | x++; |
|
|
1390 | } |
|
|
1391 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1392 | } |
|
|
1393 | return cur; |
|
|
1394 | } |
|
|
1395 | |
|
|
1396 | static void |
|
|
1397 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
1398 | { |
|
|
1399 | static long frames, bytes, tbytes, tframes; |
|
|
1400 | char *cur; |
|
|
1401 | |
|
|
1402 | SockList sl (MAXSOCKBUF); |
|
|
1403 | sl << "map "; |
|
|
1404 | |
|
|
1405 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
1406 | sl.len = cur - (char *) sl.buf; |
|
|
1407 | |
|
|
1408 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
1409 | |
|
|
1410 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
1411 | { |
|
|
1412 | /* All of this is just accounting stuff */ |
|
|
1413 | if (tframes > 100) |
|
|
1414 | tframes = tbytes = 0; |
|
|
1415 | |
|
|
1416 | tframes++; |
|
|
1417 | frames++; |
|
|
1418 | tbytes += sl.len; |
|
|
1419 | bytes += sl.len; |
|
|
1420 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
1421 | Send_With_Handling (ns, &sl); |
|
|
1422 | ns->sent_scroll = 0; |
|
|
1423 | } |
|
|
1424 | |
|
|
1425 | sl.free (); |
|
|
1426 | } |
|
|
1427 | |
|
|
1428 | |
1210 | |
1429 | /** Clears a map cell */ |
1211 | /** Clears a map cell */ |
1430 | static void |
1212 | static void |
1431 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1213 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1432 | { |
1214 | { |
… | |
… | |
1443 | #define MAX_LAYERS 3 |
1225 | #define MAX_LAYERS 3 |
1444 | |
1226 | |
1445 | /* Using a global really isn't a good approach, but saves the over head of |
1227 | /* Using a global really isn't a good approach, but saves the over head of |
1446 | * allocating and deallocating such a block of data each time run through, |
1228 | * allocating and deallocating such a block of data each time run through, |
1447 | * and saves the space of allocating this in the socket object when we only |
1229 | * and saves the space of allocating this in the socket object when we only |
1448 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1230 | * need it for this cycle. If the server is ever threaded, this needs to be |
1449 | * re-examined. |
1231 | * re-examined. |
1450 | */ |
1232 | */ |
1451 | |
|
|
1452 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1233 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1453 | |
1234 | |
1454 | /** |
1235 | /** |
1455 | * Returns true if any of the heads for this |
1236 | * Returns true if any of the heads for this |
1456 | * space is set. Returns false if all are blank - this is used |
1237 | * space is set. Returns false if all are blank - this is used |
1457 | * for empty space checking. |
1238 | * for empty space checking. |
1458 | */ |
1239 | */ |
1459 | static inline int |
1240 | static inline int |
1460 | have_head (int ax, int ay) |
1241 | have_head (int ax, int ay) |
1461 | { |
1242 | { |
1462 | |
|
|
1463 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1243 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1464 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1244 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1465 | return 1; |
1245 | return 1; |
|
|
1246 | |
1466 | return 0; |
1247 | return 0; |
1467 | } |
1248 | } |
1468 | |
1249 | |
1469 | /** |
1250 | /** |
1470 | * check_head is a bit simplistic version of update_space below. |
1251 | * check_head is a bit simplistic version of update_space below. |
1471 | * basically, it only checks the that the head on space ax,ay at layer |
1252 | * basically, it only checks the that the head on space ax,ay at layer |
1472 | * needs to get sent - if so, it adds the data, sending the head |
1253 | * needs to get sent - if so, it adds the data, sending the head |
1473 | * if needed, and returning 1. If this no data needs to get |
1254 | * if needed, and returning 1. If this no data needs to get |
1474 | * sent, it returns zero. |
1255 | * sent, it returns zero. |
1475 | */ |
1256 | */ |
1476 | static int |
1257 | static int |
1477 | check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) |
1258 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1478 | { |
1259 | { |
1479 | short face_num; |
1260 | short face_num; |
1480 | |
1261 | |
1481 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1262 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1482 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1263 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1514 | * numbers the spaces differently - I think this was a leftover from |
1295 | * numbers the spaces differently - I think this was a leftover from |
1515 | * the map command, where the faces stack up. Sinces that is no longer |
1296 | * the map command, where the faces stack up. Sinces that is no longer |
1516 | * the case, it seems to make more sense to have these layer values |
1297 | * the case, it seems to make more sense to have these layer values |
1517 | * actually match. |
1298 | * actually match. |
1518 | */ |
1299 | */ |
1519 | |
|
|
1520 | static int |
1300 | static int |
1521 | update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1301 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1522 | { |
1302 | { |
1523 | object *ob, *head; |
1303 | object *ob, *head; |
1524 | uint16 face_num; |
1304 | uint16 face_num; |
1525 | int bx, by, i; |
1305 | int bx, by, i; |
1526 | |
1306 | |
… | |
… | |
1739 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1519 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1740 | * take. |
1520 | * take. |
1741 | */ |
1521 | */ |
1742 | |
1522 | |
1743 | static inline int |
1523 | static inline int |
1744 | update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1524 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1745 | { |
1525 | { |
1746 | object *ob; |
1526 | object *ob; |
1747 | int smoothlevel; /* old face_num; */ |
1527 | int smoothlevel; /* old face_num; */ |
1748 | |
1528 | |
1749 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1529 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1783 | * Returns the size of a data for a map square as returned by |
1563 | * Returns the size of a data for a map square as returned by |
1784 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1564 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1785 | * available. |
1565 | * available. |
1786 | */ |
1566 | */ |
1787 | int |
1567 | int |
1788 | getExtendedMapInfoSize (NewSocket * ns) |
1568 | getExtendedMapInfoSize (client * ns) |
1789 | { |
1569 | { |
1790 | int result = 0; |
1570 | int result = 0; |
1791 | |
1571 | |
1792 | if (ns->ext_mapinfos) |
1572 | if (ns->ext_mapinfos) |
1793 | { |
1573 | { |
1794 | if (ns->EMI_smooth) |
1574 | if (ns->EMI_smooth) |
1795 | result += 1; /*One byte for smoothlevel */ |
1575 | result += 1; /*One byte for smoothlevel */ |
1796 | } |
1576 | } |
|
|
1577 | |
1797 | return result; |
1578 | return result; |
1798 | } |
1579 | } |
1799 | |
1580 | |
1800 | /** |
1581 | /** |
1801 | * This function uses the new map1 protocol command to send the map |
1582 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1829 | uint8 eentrysize; |
1610 | uint8 eentrysize; |
1830 | uint16 ewhatstart, ewhatflag; |
1611 | uint16 ewhatstart, ewhatflag; |
1831 | uint8 extendedinfos; |
1612 | uint8 extendedinfos; |
1832 | maptile *m; |
1613 | maptile *m; |
1833 | |
1614 | |
1834 | NewSocket &socket = pl->contr->socket; |
1615 | client &socket = *pl->contr->socket; |
1835 | |
1616 | |
1836 | check_map_change (pl->contr); |
1617 | check_map_change (pl->contr); |
1837 | |
1618 | |
1838 | SockList sl (MAXSOCKBUF); |
|
|
1839 | SockList esl (MAXSOCKBUF); |
|
|
1840 | |
|
|
1841 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1619 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
|
|
1620 | packet esl; |
|
|
1621 | |
1842 | startlen = sl.len; |
1622 | startlen = sl.length (); |
1843 | |
1623 | |
1844 | /*Extendedmapinfo structure initialisation */ |
1624 | /*Extendedmapinfo structure initialisation */ |
1845 | if (socket.ext_mapinfos) |
1625 | if (socket.ext_mapinfos) |
1846 | { |
1626 | { |
1847 | extendedinfos = EMI_NOREDRAW; |
1627 | extendedinfos = EMI_NOREDRAW; |
1848 | |
1628 | |
1849 | if (socket.EMI_smooth) |
1629 | if (socket.EMI_smooth) |
1850 | extendedinfos |= EMI_SMOOTH; |
1630 | extendedinfos |= EMI_SMOOTH; |
1851 | |
1631 | |
1852 | ewhatstart = esl.len; |
1632 | ewhatstart = esl.length (); |
1853 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1633 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1854 | could need to be taken away */ |
1634 | could need to be taken away */ |
1855 | eentrysize = getExtendedMapInfoSize (&socket); |
1635 | eentrysize = getExtendedMapInfoSize (&socket); |
1856 | esl << "mapextended " |
1636 | esl << "mapextended " |
1857 | << uint8 (extendedinfos) |
1637 | << uint8 (extendedinfos) |
1858 | << uint8 (eentrysize); |
1638 | << uint8 (eentrysize); |
|
|
1639 | |
1859 | estartlen = esl.len; |
1640 | estartlen = esl.length (); |
1860 | } |
1641 | } |
1861 | else |
1642 | else |
1862 | { |
1643 | { |
1863 | /* suppress compiler warnings */ |
1644 | /* suppress compiler warnings */ |
1864 | ewhatstart = 0; |
1645 | ewhatstart = 0; |
… | |
… | |
1889 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1670 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1890 | { |
1671 | { |
1891 | ax = 0; |
1672 | ax = 0; |
1892 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1673 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1893 | { |
1674 | { |
1894 | |
|
|
1895 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1675 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1896 | |
1676 | |
1897 | /* If this space is out of the normal viewable area, we only check |
1677 | /* If this space is out of the normal viewable area, we only check |
1898 | * the heads value ax or ay will only be greater than what |
1678 | * the heads value ax or ay will only be greater than what |
1899 | * the client wants if using the map1a command - this is because |
1679 | * the client wants if using the map1a command - this is because |
… | |
… | |
1902 | */ |
1682 | */ |
1903 | if (ax >= socket.mapx || ay >= socket.mapy) |
1683 | if (ax >= socket.mapx || ay >= socket.mapy) |
1904 | { |
1684 | { |
1905 | int i, got_one; |
1685 | int i, got_one; |
1906 | |
1686 | |
1907 | oldlen = sl.len; |
1687 | oldlen = sl.length (); |
1908 | |
1688 | |
1909 | sl << uint16 (mask); |
1689 | sl << uint16 (mask); |
1910 | |
1690 | |
1911 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1691 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1912 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1692 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
… | |
… | |
1916 | * actually need to send that - just the coordinates |
1696 | * actually need to send that - just the coordinates |
1917 | * with no faces tells the client to blank out the |
1697 | * with no faces tells the client to blank out the |
1918 | * space. |
1698 | * space. |
1919 | */ |
1699 | */ |
1920 | got_one = 0; |
1700 | got_one = 0; |
1921 | for (i = oldlen + 2; i < sl.len; i++) |
1701 | for (i = oldlen + 2; i < sl.length (); i++) |
1922 | if (sl.buf[i]) |
1702 | if (sl[i]) |
1923 | got_one = 1; |
1703 | got_one = 1; |
1924 | |
1704 | |
1925 | if (got_one && (mask & 0xf)) |
1705 | if (got_one && (mask & 0xf)) |
1926 | sl.buf[oldlen + 1] = mask & 0xff; |
1706 | sl[oldlen + 1] = mask & 0xff; |
1927 | else |
1707 | else |
1928 | { /*either all faces blank, either no face at all */ |
1708 | { /*either all faces blank, either no face at all */ |
1929 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1709 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1930 | sl.len = oldlen + 2; |
1710 | sl.reset (oldlen + 2); |
1931 | else |
1711 | else |
1932 | sl.len = oldlen; |
1712 | sl.reset (oldlen); |
1933 | } |
1713 | } |
1934 | |
1714 | |
1935 | /*What concerns extendinfos, nothing to be done for now |
1715 | /*What concerns extendinfos, nothing to be done for now |
1936 | * (perhaps effects layer later) |
1716 | * (perhaps effects layer later) |
1937 | */ |
1717 | */ |
… | |
… | |
1967 | |
1747 | |
1968 | /* This block deals with spaces that are not visible for whatever |
1748 | /* This block deals with spaces that are not visible for whatever |
1969 | * reason. Still may need to send the head for this space. |
1749 | * reason. Still may need to send the head for this space. |
1970 | */ |
1750 | */ |
1971 | |
1751 | |
1972 | oldlen = sl.len; |
1752 | oldlen = sl.length (); |
1973 | |
1753 | |
1974 | sl << uint16 (mask); |
1754 | sl << uint16 (mask); |
1975 | |
1755 | |
1976 | if (lastcell.count != -1) |
1756 | if (lastcell.count != -1) |
1977 | need_send = 1; |
1757 | need_send = 1; |
… | |
… | |
1997 | |
1777 | |
1998 | map_clearcell (&lastcell, 0, 0, 0, count); |
1778 | map_clearcell (&lastcell, 0, 0, 0, count); |
1999 | } |
1779 | } |
2000 | |
1780 | |
2001 | if ((mask & 0xf) || need_send) |
1781 | if ((mask & 0xf) || need_send) |
2002 | sl.buf[oldlen + 1] = mask & 0xff; |
1782 | sl[oldlen + 1] = mask & 0xff; |
2003 | else |
1783 | else |
2004 | sl.len = oldlen; |
1784 | sl.reset (oldlen); |
2005 | } |
1785 | } |
2006 | else |
1786 | else |
2007 | { |
1787 | { |
2008 | /* In this block, the space is visible or there are head objects |
1788 | /* In this block, the space is visible or there are head objects |
2009 | * we need to send. |
1789 | * we need to send. |
… | |
… | |
2011 | |
1791 | |
2012 | /* Rather than try to figure out what everything that we might |
1792 | /* Rather than try to figure out what everything that we might |
2013 | * need to send is, then form the packet after that, |
1793 | * need to send is, then form the packet after that, |
2014 | * we presume that we will in fact form a packet, and update |
1794 | * we presume that we will in fact form a packet, and update |
2015 | * the bits by what we do actually send. If we send nothing, |
1795 | * the bits by what we do actually send. If we send nothing, |
2016 | * we just back out sl.len to the old value, and no harm |
1796 | * we just back out sl.length () to the old value, and no harm |
2017 | * is done. |
1797 | * is done. |
2018 | * I think this is simpler than doing a bunch of checks to see |
1798 | * I think this is simpler than doing a bunch of checks to see |
2019 | * what if anything we need to send, setting the bits, then |
1799 | * what if anything we need to send, setting the bits, then |
2020 | * doing those checks again to add the real data. |
1800 | * doing those checks again to add the real data. |
2021 | */ |
1801 | */ |
2022 | oldlen = sl.len; |
1802 | oldlen = sl.length (); |
2023 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1803 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2024 | eoldlen = esl.len; |
1804 | eoldlen = esl.length (); |
2025 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1805 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2026 | sl << uint16 (mask); |
1806 | sl << uint16 (mask); |
2027 | |
1807 | |
2028 | if (socket.ext_mapinfos) |
1808 | if (socket.ext_mapinfos) |
2029 | esl << uint16 (emask); |
1809 | esl << uint16 (emask); |
… | |
… | |
2037 | mask |= 0x8; |
1817 | mask |= 0x8; |
2038 | |
1818 | |
2039 | if (socket.extmap) |
1819 | if (socket.extmap) |
2040 | { |
1820 | { |
2041 | *last_ext |= 0x80; |
1821 | *last_ext |= 0x80; |
2042 | last_ext = sl.buf + sl.len; |
1822 | last_ext = &sl[sl.length ()]; |
2043 | sl << uint8 (d); |
1823 | sl << uint8 (d); |
2044 | } |
1824 | } |
2045 | else |
1825 | else |
2046 | sl << uint8 (255 - 64 * d); |
1826 | sl << uint8 (255 - 64 * d); |
2047 | } |
1827 | } |
… | |
… | |
2081 | { |
1861 | { |
2082 | lastcell.stat_hp = stat_hp; |
1862 | lastcell.stat_hp = stat_hp; |
2083 | |
1863 | |
2084 | mask |= 0x8; |
1864 | mask |= 0x8; |
2085 | *last_ext |= 0x80; |
1865 | *last_ext |= 0x80; |
2086 | last_ext = sl.buf + sl.len; |
1866 | last_ext = &sl[sl.length ()]; |
2087 | |
1867 | |
2088 | sl << uint8 (5) << uint8 (stat_hp); |
1868 | sl << uint8 (5) << uint8 (stat_hp); |
2089 | |
1869 | |
2090 | if (stat_width > 1) |
1870 | if (stat_width > 1) |
2091 | { |
1871 | { |
2092 | *last_ext |= 0x80; |
1872 | *last_ext |= 0x80; |
2093 | last_ext = sl.buf + sl.len; |
1873 | last_ext = &sl[sl.length ()]; |
2094 | |
1874 | |
2095 | sl << uint8 (6) << uint8 (stat_width); |
1875 | sl << uint8 (6) << uint8 (stat_width); |
2096 | } |
1876 | } |
2097 | } |
1877 | } |
2098 | |
1878 | |
… | |
… | |
2100 | { |
1880 | { |
2101 | lastcell.player = player; |
1881 | lastcell.player = player; |
2102 | |
1882 | |
2103 | mask |= 0x8; |
1883 | mask |= 0x8; |
2104 | *last_ext |= 0x80; |
1884 | *last_ext |= 0x80; |
2105 | last_ext = sl.buf + sl.len; |
1885 | last_ext = &sl[sl.length ()]; |
2106 | |
1886 | |
2107 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1887 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2108 | } |
1888 | } |
2109 | |
1889 | |
2110 | if (lastcell.flags != flags) |
1890 | if (lastcell.flags != flags) |
2111 | { |
1891 | { |
2112 | lastcell.flags = flags; |
1892 | lastcell.flags = flags; |
2113 | |
1893 | |
2114 | mask |= 0x8; |
1894 | mask |= 0x8; |
2115 | *last_ext |= 0x80; |
1895 | *last_ext |= 0x80; |
2116 | last_ext = sl.buf + sl.len; |
1896 | last_ext = &sl[sl.length ()]; |
2117 | |
1897 | |
2118 | sl << uint8 (8) << uint8 (flags); |
1898 | sl << uint8 (8) << uint8 (flags); |
2119 | } |
1899 | } |
2120 | } |
1900 | } |
2121 | |
1901 | |
… | |
… | |
2163 | * space by checking the mask. If so, update the mask. |
1943 | * space by checking the mask. If so, update the mask. |
2164 | * if not, reset the len to that from before adding the mask |
1944 | * if not, reset the len to that from before adding the mask |
2165 | * value, so we don't send those bits. |
1945 | * value, so we don't send those bits. |
2166 | */ |
1946 | */ |
2167 | if (mask & 0xf) |
1947 | if (mask & 0xf) |
2168 | sl.buf[oldlen + 1] = mask & 0xff; |
1948 | sl[oldlen + 1] = mask & 0xff; |
2169 | else |
1949 | else |
2170 | sl.len = oldlen; |
1950 | sl.reset (oldlen); |
2171 | |
1951 | |
2172 | if (emask & 0xf) |
1952 | if (emask & 0xf) |
2173 | esl.buf[eoldlen + 1] = emask & 0xff; |
1953 | esl[eoldlen + 1] = emask & 0xff; |
2174 | else |
1954 | else |
2175 | esl.len = eoldlen; |
1955 | esl.reset (eoldlen); |
2176 | } /* else this is a viewable space */ |
1956 | } /* else this is a viewable space */ |
2177 | } /* for x loop */ |
1957 | } /* for x loop */ |
2178 | } /* for y loop */ |
1958 | } /* for y loop */ |
2179 | |
1959 | |
2180 | /* Verify that we in fact do need to send this */ |
1960 | /* Verify that we in fact do need to send this */ |
2181 | if (socket.ext_mapinfos) |
1961 | if (socket.ext_mapinfos) |
2182 | { |
1962 | { |
2183 | if (!(sl.len > startlen || socket.sent_scroll)) |
1963 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2184 | { |
1964 | { |
2185 | /* No map data will follow, so don't say the client |
1965 | /* No map data will follow, so don't say the client |
2186 | * it doesn't need draw! |
1966 | * it doesn't need draw! |
2187 | */ |
1967 | */ |
2188 | ewhatflag &= (~EMI_NOREDRAW); |
1968 | ewhatflag &= (~EMI_NOREDRAW); |
2189 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
1969 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2190 | } |
1970 | } |
2191 | |
1971 | |
2192 | if (esl.len > estartlen) |
1972 | if (esl.length () > estartlen) |
2193 | Send_With_Handling (&socket, &esl); |
1973 | socket.send_packet (esl); |
2194 | } |
1974 | } |
2195 | |
1975 | |
2196 | if (sl.len > startlen || socket.sent_scroll) |
1976 | if (sl.length () > startlen || socket.sent_scroll) |
2197 | { |
1977 | { |
2198 | Send_With_Handling (&socket, &sl); |
1978 | socket.send_packet (sl); |
2199 | socket.sent_scroll = 0; |
1979 | socket.sent_scroll = 0; |
2200 | } |
1980 | } |
2201 | |
|
|
2202 | sl.free (); |
|
|
2203 | esl.free (); |
|
|
2204 | } |
1981 | } |
2205 | |
1982 | |
2206 | /** |
1983 | /** |
2207 | * Draws client map. |
1984 | * Draws client map. |
2208 | */ |
1985 | */ |
… | |
… | |
2232 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2009 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2233 | return; |
2010 | return; |
2234 | |
2011 | |
2235 | memset (&newmap, 0, sizeof (struct Map)); |
2012 | memset (&newmap, 0, sizeof (struct Map)); |
2236 | |
2013 | |
2237 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
2014 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2238 | { |
|
|
2239 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
2015 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2240 | { |
2016 | { |
2241 | ax = i; |
2017 | ax = i; |
2242 | ay = j; |
2018 | ay = j; |
2243 | m = pm; |
2019 | m = pm; |
2244 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2020 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2021 | |
2245 | if (mflags & P_OUT_OF_MAP) |
2022 | if (mflags & P_OUT_OF_MAP) |
2246 | continue; |
2023 | continue; |
2247 | if (mflags & P_NEED_UPDATE) |
2024 | |
2248 | update_position (m, ax, ay); |
|
|
2249 | /* If a map is visible to the player, we don't want to swap it out |
2025 | /* If a map is visible to the player, we don't want to swap it out |
2250 | * just to reload it. This should really call something like |
2026 | * just to reload it. This should really call something like |
2251 | * swap_map, but this is much more efficient and 'good enough' |
2027 | * swap_map, but this is much more efficient and 'good enough' |
2252 | */ |
2028 | */ |
2253 | if (mflags & P_NEW_MAP) |
2029 | if (mflags & P_NEW_MAP) |
2254 | m->timeout = 50; |
2030 | m->timeout = 50; |
2255 | } |
2031 | } |
2256 | } |
2032 | |
2257 | /* do LOS after calls to update_position */ |
2033 | /* do LOS after calls to update_position */ |
2258 | if (pl->contr->do_los) |
2034 | if (pl->contr->do_los) |
2259 | { |
2035 | { |
2260 | update_los (pl); |
2036 | update_los (pl); |
2261 | pl->contr->do_los = 0; |
2037 | pl->contr->do_los = 0; |
2262 | } |
2038 | } |
2263 | |
2039 | |
2264 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
2265 | { |
|
|
2266 | /* Big maps need a different drawing mechanism to work */ |
2040 | /* Big maps need a different drawing mechanism to work */ |
2267 | draw_client_map1 (pl); |
2041 | draw_client_map1 (pl); |
2268 | return; |
|
|
2269 | } |
|
|
2270 | |
|
|
2271 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2272 | { |
|
|
2273 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
2274 | } |
|
|
2275 | |
|
|
2276 | /* j and i are the y and x coordinates of the real map (which is |
|
|
2277 | * basically some number of spaces around the player) |
|
|
2278 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
2279 | * left corner) and are thus disconnected from the map values. |
|
|
2280 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
2281 | * player has specified an even map. Otherwise, we try to send them too |
|
|
2282 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
2283 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
2284 | * odd, this still works fine. |
|
|
2285 | */ |
|
|
2286 | ay = 0; |
|
|
2287 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
2288 | { |
|
|
2289 | ax = 0; |
|
|
2290 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
2291 | { |
|
|
2292 | |
|
|
2293 | d = pl->contr->blocked_los[ax][ay]; |
|
|
2294 | /* note the out_of_map and d>3 checks are both within the same |
|
|
2295 | * negation check. |
|
|
2296 | */ |
|
|
2297 | nx = i; |
|
|
2298 | ny = j; |
|
|
2299 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
2300 | if (m && d < 4) |
|
|
2301 | { |
|
|
2302 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
2303 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
2304 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
2305 | |
|
|
2306 | /* If all is blank, send a blank face. */ |
|
|
2307 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
2308 | { |
|
|
2309 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
2310 | } |
|
|
2311 | else |
|
|
2312 | { /* actually have something interesting */ |
|
|
2313 | /* send the darkness mask, if any. */ |
|
|
2314 | if (d && pl->contr->socket.darkness) |
|
|
2315 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
2316 | |
|
|
2317 | if (face && face != blank_face) |
|
|
2318 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
2319 | if (floor2 && floor2 != blank_face) |
|
|
2320 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
2321 | if (floor && floor != blank_face) |
|
|
2322 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
2323 | } |
|
|
2324 | } /* Is a valid space */ |
|
|
2325 | } |
|
|
2326 | } |
|
|
2327 | |
|
|
2328 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
2329 | |
|
|
2330 | check_map_change (pl->contr); |
|
|
2331 | } |
2042 | } |
2332 | |
2043 | |
2333 | |
2044 | |
2334 | /*****************************************************************************/ |
2045 | /*****************************************************************************/ |
2335 | |
2046 | |
… | |
… | |
2341 | |
2052 | |
2342 | /*****************************************************************************/ |
2053 | /*****************************************************************************/ |
2343 | void |
2054 | void |
2344 | send_plugin_custom_message (object *pl, char *buf) |
2055 | send_plugin_custom_message (object *pl, char *buf) |
2345 | { |
2056 | { |
2346 | cs_write_string (&pl->contr->socket, buf, strlen (buf)); |
2057 | pl->contr->socket->send_packet (buf); |
2347 | } |
2058 | } |
2348 | |
2059 | |
2349 | /** |
2060 | /** |
2350 | * This sends the skill number to name mapping. We ignore |
2061 | * This sends the skill number to name mapping. We ignore |
2351 | * the params - we always send the same info no matter what. |
2062 | * the params - we always send the same info no matter what. |
2352 | */ |
2063 | */ |
2353 | void |
2064 | void |
2354 | send_skill_info (NewSocket *ns, char *params) |
2065 | send_skill_info (client *ns, char *params) |
2355 | { |
2066 | { |
2356 | SockList sl (MAXSOCKBUF); |
2067 | packet sl; |
2357 | sl << "replyinfo skill_info\n"; |
2068 | sl << "replyinfo skill_info\n"; |
2358 | |
2069 | |
2359 | for (int i = 1; i < NUM_SKILLS; i++) |
2070 | for (int i = 1; i < NUM_SKILLS; i++) |
2360 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2071 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2361 | |
2072 | |
2362 | if (sl.len >= MAXSOCKBUF) |
2073 | if (sl.length () >= MAXSOCKBUF) |
2363 | { |
2074 | { |
2364 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2075 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2365 | fatal (0); |
2076 | fatal (0); |
2366 | } |
2077 | } |
2367 | |
2078 | |
2368 | Send_With_Handling (ns, &sl); |
2079 | ns->send_packet (sl); |
2369 | sl.free (); |
|
|
2370 | } |
2080 | } |
2371 | |
2081 | |
2372 | /** |
2082 | /** |
2373 | * This sends the spell path to name mapping. We ignore |
2083 | * This sends the spell path to name mapping. We ignore |
2374 | * the params - we always send the same info no matter what. |
2084 | * the params - we always send the same info no matter what. |
2375 | */ |
2085 | */ |
2376 | void |
2086 | void |
2377 | send_spell_paths (NewSocket * ns, char *params) |
2087 | send_spell_paths (client * ns, char *params) |
2378 | { |
2088 | { |
2379 | SockList sl (MAXSOCKBUF); |
2089 | packet sl; |
2380 | |
2090 | |
2381 | sl << "replyinfo spell_paths\n"; |
2091 | sl << "replyinfo spell_paths\n"; |
2382 | |
2092 | |
2383 | for (int i = 0; i < NRSPELLPATHS; i++) |
2093 | for (int i = 0; i < NRSPELLPATHS; i++) |
2384 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2094 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2385 | |
2095 | |
2386 | if (sl.len >= MAXSOCKBUF) |
2096 | if (sl.length () >= MAXSOCKBUF) |
2387 | { |
2097 | { |
2388 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2098 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2389 | fatal (0); |
2099 | fatal (0); |
2390 | } |
2100 | } |
2391 | |
2101 | |
2392 | Send_With_Handling (ns, &sl); |
2102 | ns->send_packet (sl); |
2393 | sl.free (); |
|
|
2394 | } |
2103 | } |
2395 | |
2104 | |
2396 | /** |
2105 | /** |
2397 | * This looks for any spells the player may have that have changed their stats. |
2106 | * This looks for any spells the player may have that have changed their stats. |
2398 | * it then sends an updspell packet for each spell that has changed in this way |
2107 | * it then sends an updspell packet for each spell that has changed in this way |
2399 | */ |
2108 | */ |
2400 | void |
2109 | void |
2401 | esrv_update_spells (player *pl) |
2110 | esrv_update_spells (player *pl) |
2402 | { |
2111 | { |
2403 | if (!pl->socket.monitor_spells) |
2112 | if (!pl->socket->monitor_spells) |
2404 | return; |
2113 | return; |
2405 | |
2114 | |
2406 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2115 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2407 | { |
2116 | { |
2408 | if (spell->type == SPELL) |
2117 | if (spell->type == SPELL) |
… | |
… | |
2428 | flags |= UPD_SP_DAMAGE; |
2137 | flags |= UPD_SP_DAMAGE; |
2429 | } |
2138 | } |
2430 | |
2139 | |
2431 | if (flags) |
2140 | if (flags) |
2432 | { |
2141 | { |
2433 | SockList sl (MAXSOCKBUF); |
2142 | packet sl; |
2434 | |
2143 | |
2435 | sl << "updspell " |
2144 | sl << "updspell " |
2436 | << uint8 (flags) |
2145 | << uint8 (flags) |
2437 | << uint32 (spell->count); |
2146 | << uint32 (spell->count); |
2438 | |
2147 | |
2439 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2148 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2440 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2149 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2441 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2150 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2442 | |
2151 | |
2443 | Send_With_Handling (&pl->socket, &sl); |
2152 | pl->socket->send_packet (sl); |
2444 | sl.free (); |
|
|
2445 | } |
2153 | } |
2446 | } |
2154 | } |
2447 | } |
2155 | } |
2448 | } |
2156 | } |
2449 | |
2157 | |
2450 | void |
2158 | void |
2451 | esrv_remove_spell (player *pl, object *spell) |
2159 | esrv_remove_spell (player *pl, object *spell) |
2452 | { |
2160 | { |
2453 | if (!pl->socket.monitor_spells) |
2161 | if (!pl->socket->monitor_spells) |
2454 | return; |
2162 | return; |
2455 | |
2163 | |
2456 | if (!pl || !spell || spell->env != pl->ob) |
2164 | if (!pl || !spell || spell->env != pl->ob) |
2457 | { |
2165 | { |
2458 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2166 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2459 | return; |
2167 | return; |
2460 | } |
2168 | } |
2461 | |
2169 | |
2462 | SockList sl (MAXSOCKBUF); |
2170 | packet sl ("delspell"); |
2463 | |
2171 | |
2464 | sl << "delspell " |
|
|
2465 | << uint32 (spell->count); |
2172 | sl << uint32 (spell->count); |
2466 | |
2173 | |
2467 | Send_With_Handling (&pl->socket, &sl); |
2174 | pl->socket->send_packet (sl); |
2468 | sl.free (); |
|
|
2469 | } |
2175 | } |
2470 | |
2176 | |
2471 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2177 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2472 | static void |
2178 | static void |
2473 | append_spell (player *pl, SockList &sl, object *spell) |
2179 | append_spell (player *pl, packet &sl, object *spell) |
2474 | { |
2180 | { |
2475 | int len, i, skill = 0; |
2181 | int len, i, skill = 0; |
2476 | |
2182 | |
2477 | if (!(spell->name)) |
2183 | if (!(spell->name)) |
2478 | { |
2184 | { |
… | |
… | |
2521 | { |
2227 | { |
2522 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2228 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2523 | return; |
2229 | return; |
2524 | } |
2230 | } |
2525 | |
2231 | |
2526 | if (!pl->socket.monitor_spells) |
2232 | if (!pl->socket->monitor_spells) |
2527 | return; |
2233 | return; |
2528 | |
2234 | |
2529 | SockList sl (MAXSOCKBUF); |
2235 | packet sl ("addspell"); |
2530 | |
|
|
2531 | sl << "addspell "; |
|
|
2532 | |
2236 | |
2533 | if (!spell) |
2237 | if (!spell) |
2534 | { |
2238 | { |
2535 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2239 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2536 | { |
2240 | { |
… | |
… | |
2548 | * like it will fix this |
2252 | * like it will fix this |
2549 | */ |
2253 | */ |
2550 | if (spell->type != SPELL) |
2254 | if (spell->type != SPELL) |
2551 | continue; |
2255 | continue; |
2552 | |
2256 | |
2553 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2257 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2554 | { |
2258 | { |
2555 | Send_With_Handling (&pl->socket, &sl); |
2259 | pl->socket->send_packet (sl); |
2556 | strcpy ((char *) sl.buf, "addspell "); |
2260 | |
2557 | sl.len = strlen ((char *) sl.buf); |
2261 | sl.reset (); |
|
|
2262 | sl << "addspell "; |
2558 | } |
2263 | } |
2559 | |
2264 | |
2560 | append_spell (pl, sl, spell); |
2265 | append_spell (pl, sl, spell); |
2561 | } |
2266 | } |
2562 | } |
2267 | } |
… | |
… | |
2573 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2278 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2574 | fatal (0); |
2279 | fatal (0); |
2575 | } |
2280 | } |
2576 | |
2281 | |
2577 | /* finally, we can send the packet */ |
2282 | /* finally, we can send the packet */ |
2578 | Send_With_Handling (&pl->socket, &sl); |
2283 | pl->socket->send_packet (sl); |
2579 | |
|
|
2580 | sl.free (); |
|
|
2581 | } |
2284 | } |
2582 | |
2285 | |