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